diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs
index f3277f08..b9dc3961 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroColors.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,12 +15,7 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
-using System.Windows.Media;
 
 namespace Xceed.Wpf.AvalonDock.Themes
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs
index 1ff53e6e..29e273eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/AeroTheme.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.AvalonDock.Themes
 {
@@ -28,6 +25,11 @@ namespace Xceed.Wpf.AvalonDock.Themes
     {
       string assemblyName = "Xceed.Wpf.AvalonDock.Themes.Aero";
 
+#if NETCORE
+            assemblyName += ".NETCore";
+#elif NET5
+            assemblyName += ".NET5";
+#endif
 
       return new Uri(
           "/" + assemblyName + ";component/Theme.xaml",
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml
index f6924f56..c3b55b6d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Brushes.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs
index 164d8a35..b9d5be12 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Controls/SplineBorder.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,148 +15,162 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Xceed.Wpf.AvalonDock.Themes.Controls
 {
-    public class SplineBorder : Control
+  public class SplineBorder : Control
+  {
+
+    public SplineBorder()
+    {
+      //RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);
+    }
+
+
+    #region Thickness
+
+    /// <summary>
+    /// Thickness Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty ThicknessProperty =
+        DependencyProperty.Register( "Thickness", typeof( double ), typeof( SplineBorder ),
+            new FrameworkPropertyMetadata( ( double )1.0, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    /// <summary>
+    /// Gets or sets the Thickness property.  This dependency property 
+    /// indicates the border thickness.
+    /// </summary>
+    public double Thickness
+    {
+      get
+      {
+        return ( double )GetValue( ThicknessProperty );
+      }
+      set
+      {
+        SetValue( ThicknessProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Fill
+
+    /// <summary>
+    /// Fill Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty FillProperty =
+        DependencyProperty.Register( "Fill", typeof( Brush ), typeof( SplineBorder ),
+            new FrameworkPropertyMetadata( ( Brush )null, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    /// <summary>
+    /// Gets or sets the Fill property.  This dependency property 
+    /// indicates the fill color.
+    /// </summary>
+    public Brush Fill
+    {
+      get
+      {
+        return ( Brush )GetValue( FillProperty );
+      }
+      set
+      {
+        SetValue( FillProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region Stroke
+
+    /// <summary>
+    /// Stroke Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty StrokeProperty =
+        DependencyProperty.Register( "Stroke", typeof( Brush ), typeof( SplineBorder ),
+            new FrameworkPropertyMetadata( Brushes.Black, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    /// <summary>
+    /// Gets or sets the Stroke property.  This dependency property 
+    /// indicates the stroke brush.
+    /// </summary>
+    public Brush Stroke
     {
+      get
+      {
+        return ( Brush )GetValue( StrokeProperty );
+      }
+      set
+      {
+        SetValue( StrokeProperty, value );
+      }
+    }
+
+    #endregion
+
+    #region BottomBorderMargin
+
+    /// <summary>
+    /// BottomBorderMargin Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty BottomBorderMarginProperty =
+        DependencyProperty.Register( "BottomBorderMargin", typeof( double ), typeof( SplineBorder ),
+            new FrameworkPropertyMetadata( ( double )0.0, FrameworkPropertyMetadataOptions.AffectsRender ) );
+
+    /// <summary>
+    /// Gets or sets the BottomBorderMargin property.  This dependency property 
+    /// indicates the adjustment for the bottom margin.
+    /// </summary>
+    public double BottomBorderMargin
+    {
+      get
+      {
+        return ( double )GetValue( BottomBorderMarginProperty );
+      }
+      set
+      {
+        SetValue( BottomBorderMarginProperty, value );
+      }
+    }
+
+    #endregion
+
+
+
+    protected override void OnRender( DrawingContext drawingContext )
+    {
+      var pgFill = new PathGeometry();
+      var pfFill = new PathFigure() { IsFilled = true, IsClosed = true };
+      pfFill.StartPoint = new Point( ActualWidth, 0.0 );
+
+      var q1Fill = new QuadraticBezierSegment() { Point1 = new Point( ActualWidth * 2 / 3, 0.0 ), Point2 = new Point( ActualWidth / 2.0, ActualHeight / 2.0 ), IsStroked = false };
+      pfFill.Segments.Add( q1Fill );
+      var q2Fill = new QuadraticBezierSegment() { Point1 = new Point( ActualWidth / 3, ActualHeight ), Point2 = new Point( 0, ActualHeight ), IsStroked = false };
+      pfFill.Segments.Add( q2Fill );
+
+      pfFill.Segments.Add( new LineSegment() { Point = new Point( ActualWidth, ActualHeight ), IsStroked = false } );
+
+      pgFill.Figures.Add( pfFill );
+
+      drawingContext.DrawGeometry( Fill, null, pgFill );
+
+      var pgBorder = new PathGeometry();
+      var pfBorder = new PathFigure() { IsFilled = false, IsClosed = false };
+      pfBorder.StartPoint = new Point( ActualWidth, Thickness / 2 );
+
+      var q1Border = new QuadraticBezierSegment() { Point1 = new Point( ActualWidth * 2 / 3, 0.0 ), Point2 = new Point( ActualWidth / 2.0, ActualHeight / 2.0 ) };
+      pfBorder.Segments.Add( q1Border );
+      var q2Border = new QuadraticBezierSegment() { Point1 = new Point( ActualWidth / 3, ActualHeight ), Point2 = new Point( 0.0, ActualHeight - BottomBorderMargin ) };
+      pfBorder.Segments.Add( q2Border );
+
+      pgBorder.Figures.Add( pfBorder );
 
-        public SplineBorder()
-        {
-            //RenderOptions.SetEdgeMode(this, EdgeMode.Aliased);
-        }
-
-
-        #region Thickness
-
-        /// <summary>
-        /// Thickness Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty ThicknessProperty =
-            DependencyProperty.Register("Thickness", typeof(double), typeof(SplineBorder),
-                new FrameworkPropertyMetadata((double)1.0, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        /// <summary>
-        /// Gets or sets the Thickness property.  This dependency property 
-        /// indicates the border thickness.
-        /// </summary>
-        public double Thickness
-        {
-            get { return (double)GetValue(ThicknessProperty); }
-            set { SetValue(ThicknessProperty, value); }
-        }
-
-        #endregion
-
-        #region Fill
-
-        /// <summary>
-        /// Fill Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty FillProperty =
-            DependencyProperty.Register("Fill", typeof(Brush), typeof(SplineBorder),
-                new FrameworkPropertyMetadata((Brush)null, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        /// <summary>
-        /// Gets or sets the Fill property.  This dependency property 
-        /// indicates the fill color.
-        /// </summary>
-        public Brush Fill
-        {
-            get { return (Brush)GetValue(FillProperty); }
-            set { SetValue(FillProperty, value); }
-        }
-
-        #endregion
-
-        #region Stroke
-
-        /// <summary>
-        /// Stroke Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty StrokeProperty =
-            DependencyProperty.Register("Stroke", typeof(Brush), typeof(SplineBorder),
-                new FrameworkPropertyMetadata(Brushes.Black, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        /// <summary>
-        /// Gets or sets the Stroke property.  This dependency property 
-        /// indicates the stroke brush.
-        /// </summary>
-        public Brush Stroke
-        {
-            get { return (Brush)GetValue(StrokeProperty); }
-            set { SetValue(StrokeProperty, value); }
-        }
-
-        #endregion
-
-        #region BottomBorderMargin
-
-        /// <summary>
-        /// BottomBorderMargin Dependency Property
-        /// </summary>
-        public static readonly DependencyProperty BottomBorderMarginProperty =
-            DependencyProperty.Register("BottomBorderMargin", typeof(double), typeof(SplineBorder),
-                new FrameworkPropertyMetadata((double)0.0, FrameworkPropertyMetadataOptions.AffectsRender));
-
-        /// <summary>
-        /// Gets or sets the BottomBorderMargin property.  This dependency property 
-        /// indicates the adjustment for the bottom margin.
-        /// </summary>
-        public double BottomBorderMargin
-        {
-            get { return (double)GetValue(BottomBorderMarginProperty); }
-            set { SetValue(BottomBorderMarginProperty, value); }
-        }
-
-        #endregion
-
-
-
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            var pgFill = new PathGeometry();
-            var pfFill = new PathFigure() { IsFilled = true, IsClosed = true };
-            pfFill.StartPoint = new Point(ActualWidth, 0.0);
-
-            var q1Fill = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth * 2 / 3, 0.0), Point2 = new Point(ActualWidth / 2.0, ActualHeight / 2.0), IsStroked = false };
-            pfFill.Segments.Add(q1Fill);
-            var q2Fill = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth / 3, ActualHeight ), Point2 = new Point(0, ActualHeight ), IsStroked = false };
-            pfFill.Segments.Add(q2Fill);
-
-            pfFill.Segments.Add(new LineSegment() { Point = new Point(ActualWidth, ActualHeight ), IsStroked = false });
-
-            pgFill.Figures.Add(pfFill);
-
-            drawingContext.DrawGeometry(Fill, null, pgFill);
-
-            var pgBorder = new PathGeometry();
-            var pfBorder = new PathFigure() { IsFilled = false, IsClosed = false };
-            pfBorder.StartPoint = new Point(ActualWidth, Thickness / 2);
-
-            var q1Border = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth * 2 / 3, 0.0), Point2 = new Point(ActualWidth / 2.0, ActualHeight / 2.0) };
-            pfBorder.Segments.Add(q1Border);
-            var q2Border = new QuadraticBezierSegment() { Point1 = new Point(ActualWidth / 3, ActualHeight), Point2 = new Point(0.0, ActualHeight - BottomBorderMargin) };
-            pfBorder.Segments.Add(q2Border);
-
-            pgBorder.Figures.Add(pfBorder);
-
-            drawingContext.DrawGeometry(null, new Pen(Stroke, Thickness), pgBorder);
+      drawingContext.DrawGeometry( null, new Pen( Stroke, Thickness ), pgBorder );
 
-            base.OnRender(drawingContext);
-        }
+      base.OnRender( drawingContext );
     }
+  }
 }
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 ae56ddba..ee01ad2b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -31,7 +31,7 @@ using System;
 
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2021" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2022" )]
 
 
 
@@ -65,7 +65,11 @@ using System;
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
+#if NETCORE || NET5
+[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )]
+#else
 [assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
+#endif
 [assembly: AssemblyKeyName( "" )]
 #pragma warning restore 1699
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
index 9e7055d6..3e3752e1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Theme.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -1832,15 +1832,8 @@
             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="WindowStyle"
+            Value="None" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
@@ -1902,7 +1895,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
                       </Grid.RowDefinitions>
-                      <TextBlock Text="Active Tool Windows"
+                      <TextBlock Text="{Binding LayoutAnchorablesLabel, Mode=TwoWay}"
                                  FontWeight="Bold"
                                  Margin="0,3,0,4" >
                       </TextBlock>
@@ -1940,7 +1933,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
                       </Grid.RowDefinitions>
-                      <TextBlock Text="Active Files"
+                      <TextBlock Text="{Binding LayoutDocumentsLabel, Mode=TwoWay}"
                                  FontWeight="Bold"
                                  Margin="0,3,0,4" >
                       </TextBlock>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.NET5.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.NET5.csproj
new file mode 100644
index 00000000..e3f047e9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Aero/Xceed.Wpf.AvalonDock.Themes.Aero.NET5.csproj
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>obj\net5\</BaseIntermediateOutputPath>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <RootNamespace>Xceed.Wpf.AvalonDock.Themes</RootNamespace>
+    <AssemblyName>Xceed.Wpf.AvalonDock.Themes.Aero.NET5</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NET5</DefineConstants>
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;NET5</DefineConstants>
+    <DebugType>none</DebugType>
+    <DebugSymbols>False</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
+      <Link>AssemblyVersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
+      <Link>AssemblyVersionInfoCommon.cs</Link>
+    </Compile>
+    <Compile Include="AeroColors.cs" />
+    <Compile Include="Controls\SplineBorder.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="AeroTheme.cs" />
+    <AppDesigner Include="Properties\" />
+    <Page Include="Brushes.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Theme.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Resource Include="Images\DockAnchorableBottom.png" />
+    <Resource Include="Images\PinAutoHide.png" />
+    <Resource Include="Images\PinClose_Dark.png" />
+    <Resource Include="Images\PinAutoHide_Black.png" />
+    <Resource Include="Images\PinAutoHide_Dark.png" />
+    <Resource Include="Images\PinClose.png" />
+    <Resource Include="Images\PinClose_Black.png" />
+    <Resource Include="Images\PinRestore_Dark.png" />
+    <Resource Include="Images\PinDocMenu.png" />
+    <Resource Include="Images\PinDocMenu_Black.png" />
+    <Resource Include="Images\PinMaximize.png" />
+    <Resource Include="Images\PinMaximize_Black.png" />
+    <Resource Include="Images\PinMaximize_Dark.png" />
+    <Resource Include="Images\PinMenu.png" />
+    <Resource Include="Images\PinMenu_Black.png" />
+    <Resource Include="Images\PinMenu_Dark.png" />
+    <Resource Include="Images\PinRestore.png" />
+    <Resource Include="Images\PinRestore_Black.png" />
+    <Resource Include="Images\DockPaneLargeEmpty.png" />
+    <Resource Include="Images\DockAnchorableLeft.png" />
+    <Resource Include="Images\DockAnchorableRight.png" />
+    <Resource Include="Images\DockAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableBottom.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableLeft.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableRight.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentBottom.png" />
+    <Resource Include="Images\DockDocumentInside.png" />
+    <Resource Include="Images\DockDocumentLeft.png" />
+    <Resource Include="Images\DockDocumentRight.png" />
+    <Resource Include="Images\DockDocumentTop.png" />
+    <Resource Include="Images\DockPaneEmpty.png" />
+    <Resource Include="Images\HTabGroup.png" />
+    <Resource Include="Images\Locked.png" />
+    <Resource Include="Images\VTabGroup.png" />
+    <Resource Include="Images\PinDocMenu_Dark.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.NET5.csproj" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml
index e92fe5a5..d512c2e6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Brushes.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs
index 40bb5528..b3c6eacd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/MetroTheme.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.AvalonDock.Themes
 {
@@ -28,6 +25,11 @@ namespace Xceed.Wpf.AvalonDock.Themes
     {
       string assemblyName = "Xceed.Wpf.AvalonDock.Themes.Metro";
 
+#if NETCORE
+          assemblyName += ".NETCore";
+#elif NET5
+          assemblyName += ".NET5";
+#endif
 
       return new Uri(
           "/" + assemblyName + ";component/Theme.xaml",
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 a217ef86..2428296d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -31,7 +31,7 @@ using System;
 
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2021" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2022" )]
 
 
 
@@ -65,6 +65,10 @@ using System;
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
+#if NETCORE || NET5
+[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )]
+#else
 [assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
+#endif
 [assembly: AssemblyKeyName( "" )]
 #pragma warning restore 1699
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
index 3359df82..be965027 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Theme.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -1902,14 +1902,8 @@
             Value="WidthAndHeight" />
     <Setter Property="ResizeMode"
             Value="NoResize" />
-    <!--<Setter Property="shell:WindowChrome.WindowChrome">
-            <Setter.Value>
-                <shell:WindowChrome
-                    ResizeBorderThickness="10"
-                    CaptionHeight="16"
-                    GlassFrameThickness="4"/>
-            </Setter.Value>
-        </Setter>-->
+    <Setter Property="WindowStyle"
+            Value="None" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
@@ -1969,7 +1963,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
                       </Grid.RowDefinitions>
-                      <TextBlock Text="Active Tool Windows"
+                      <TextBlock Text="{Binding LayoutAnchorablesLabel, Mode=TwoWay}"
                                  FontWeight="Bold"
                                  Margin="0,3,0,4" >
                       </TextBlock>
@@ -2007,7 +2001,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
                       </Grid.RowDefinitions>
-                      <TextBlock Text="Active Files"
+                      <TextBlock Text="{Binding LayoutDocumentsLabel, Mode=TwoWay}"
                                  FontWeight="Bold"
                                  Margin="0,3,0,4" >
                       </TextBlock>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.NET5.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.NET5.csproj
new file mode 100644
index 00000000..fbd778b9
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.Metro/Xceed.Wpf.AvalonDock.Themes.Metro.NET5.csproj
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>obj\net5\</BaseIntermediateOutputPath>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <RootNamespace>Xceed.Wpf.AvalonDock.Themes.Metro</RootNamespace>
+    <AssemblyName>Xceed.Wpf.AvalonDock.Themes.Metro.NET5</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NET5</DefineConstants>
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;NET5</DefineConstants>
+    <DebugType>none</DebugType>
+    <DebugSymbols>False</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
+      <Link>AssemblyVersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
+      <Link>AssemblyVersionInfoCommon.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="MetroTheme.cs" />
+    <AppDesigner Include="Properties\" />
+    <Page Include="Brushes.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Theme.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Resource Include="Images\DockAnchorableBottom.png" />
+    <Resource Include="Images\DockAnchorableLeft.png" />
+    <Resource Include="Images\DockAnchorableRight.png" />
+    <Resource Include="Images\DockAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableBottom.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableLeft.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableRight.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentBottom.png" />
+    <Resource Include="Images\DockDocumentInside.png" />
+    <Resource Include="Images\DockDocumentLeft.png" />
+    <Resource Include="Images\DockDocumentRight.png" />
+    <Resource Include="Images\DockDocumentTop.png" />
+    <Resource Include="Images\DockPaneEmpty.png" />
+    <Resource Include="Images\DockPaneLargeEmpty.png" />
+    <Resource Include="Images\HTabGroup.png" />
+    <Resource Include="Images\Locked.png" />
+    <Resource Include="Images\PinAutoHide.png" />
+    <Resource Include="Images\PinAutoHide_Black.png" />
+    <Resource Include="Images\PinAutoHide_Dark.png" />
+    <Resource Include="Images\PinClose.png" />
+    <Resource Include="Images\PinClose_Black.png" />
+    <Resource Include="Images\PinClose_Dark.png" />
+    <Resource Include="Images\PinDocMenu.png" />
+    <Resource Include="Images\PinDocMenu_Black.png" />
+    <Resource Include="Images\PinMaximize.png" />
+    <Resource Include="Images\PinMaximize_Black.png" />
+    <Resource Include="Images\PinMaximize_Dark.png" />
+    <Resource Include="Images\PinMenu.png" />
+    <Resource Include="Images\PinMenu_Black.png" />
+    <Resource Include="Images\PinMenu_Dark.png" />
+    <Resource Include="Images\PinRestore.png" />
+    <Resource Include="Images\PinRestore_Black.png" />
+    <Resource Include="Images\PinRestore_Dark.png" />
+    <Resource Include="Images\VTabGroup.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.NET5.csproj" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml
index b9c488fa..fc60125e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Brushes.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 d5baadef..ddee1b95 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -31,7 +31,7 @@ using System;
 
 [assembly: AssemblyCompany( "Xceed Software Inc." )]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF - AvalonDock" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2021" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2022" )]
 
 
 // Setting ComVisible to false makes the types in this assembly not visible 
@@ -64,6 +64,11 @@ using System;
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
+#if NETCORE || NET5
+[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )]
+#else
 [assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
+#endif
 [assembly: AssemblyKeyName( "" )]
 #pragma warning restore 1699
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
index e2c48146..289ce722 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Theme.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -2040,15 +2040,8 @@
             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="WindowStyle"
+            Value="None" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
@@ -2110,7 +2103,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
                       </Grid.RowDefinitions>
-                      <TextBlock Text="Active Tool Windows"
+                      <TextBlock Text="{Binding LayoutAnchorablesLabel, Mode=TwoWay}"
                                  FontWeight="Bold"
                                  Margin="0,3,0,4" >
                       </TextBlock>
@@ -2148,7 +2141,7 @@
                         <RowDefinition Height="Auto" />
                         <RowDefinition />
                       </Grid.RowDefinitions>
-                      <TextBlock Text="Active Files"
+                      <TextBlock Text="{Binding LayoutDocumentsLabel, Mode=TwoWay}"
                                  FontWeight="Bold"
                                  Margin="0,3,0,4">
                       </TextBlock>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs
index c36f4fd9..0f01c239 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/VS2010Theme.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.AvalonDock.Themes
 {
@@ -28,6 +25,11 @@ namespace Xceed.Wpf.AvalonDock.Themes
     {
       string assemblyName = "Xceed.Wpf.AvalonDock.Themes.VS2010";
 
+#if NETCORE
+        assemblyName += ".NETCore";
+#elif NET5
+        assemblyName += ".NET5";
+#endif
 
       return new Uri(
                 "/" + assemblyName + ";component/Theme.xaml",
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.csproj
new file mode 100644
index 00000000..b9a15e3e
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock.Themes.VS2010/Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.csproj
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>obj\net5\</BaseIntermediateOutputPath>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <RootNamespace>Xceed.Wpf.AvalonDock.Themes</RootNamespace>
+    <AssemblyName>Xceed.Wpf.AvalonDock.Themes.VS2010.NET5</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NET5</DefineConstants>
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;NET5</DefineConstants>
+    <DebugType>none</DebugType>
+    <DebugSymbols>False</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <Page Include="Brushes.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Theme.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
+      <Link>AssemblyVersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
+      <Link>AssemblyVersionInfoCommon.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="VS2010Theme.cs" />
+    <AppDesigner Include="Properties\" />
+    <Resource Include="Images\DockAnchorableBottom.png" />
+    <Resource Include="Images\DockAnchorableLeft.png" />
+    <Resource Include="Images\DockAnchorableRight.png" />
+    <Resource Include="Images\DockAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableBottom.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableLeft.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableRight.png" />
+    <Resource Include="Images\DockDocumentAsAnchorableTop.png" />
+    <Resource Include="Images\DockDocumentBottom.png" />
+    <Resource Include="Images\DockDocumentInside.png" />
+    <Resource Include="Images\DockDocumentLeft.png" />
+    <Resource Include="Images\DockDocumentRight.png" />
+    <Resource Include="Images\DockDocumentTop.png" />
+    <Resource Include="Images\DockPaneEmpty.png" />
+    <Resource Include="Images\DockPaneLargeEmpty.png" />
+    <Resource Include="Images\HTabGroup.png" />
+    <Resource Include="Images\Locked.png" />
+    <Resource Include="Images\PinAutoHide.png" />
+    <Resource Include="Images\PinClose.png" />
+    <Resource Include="Images\PinDocMenu.png" />
+    <Resource Include="Images\PinMenu.png" />
+    <Resource Include="Images\VTabGroup.png" />
+    <Resource Include="Images\PinAutoHide_Dark.png" />
+    <Resource Include="Images\PinClose_Dark.png" />
+    <Resource Include="Images\PinMenu_Dark.png" />
+    <Resource Include="Images\PinMaximize.png" />
+    <Resource Include="Images\PinRestore.png" />
+    <Resource Include="Images\PinMaximize_Dark.png" />
+    <Resource Include="Images\PinRestore_Dark.png" />
+    <Resource Include="Images\PinDocMenu_Black.png" />
+    <Resource Include="Images\PinAutoHide_Black.png" />
+    <Resource Include="Images\PinClose_Black.png" />
+    <Resource Include="Images\PinMaximize_Black.png" />
+    <Resource Include="Images\PinMenu_Black.png" />
+    <Resource Include="Images\PinRestore_Black.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.NET5.csproj" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs
index 1f16c95d..7def2607 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Commands/RelayCommand.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs
index 60fb72a7..0135766b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneControlOverlayArea.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs
index 3d356674..c4ded83e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneDropTarget.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -55,6 +55,12 @@ namespace Xceed.Wpf.AvalonDock.Controls
       ILayoutAnchorablePane targetModel = _targetPane.Model as ILayoutAnchorablePane;
       LayoutAnchorable anchorableActive = floatingWindow.Descendents().OfType<LayoutAnchorable>().FirstOrDefault();
 
+      if( ( targetModel.FindParent<LayoutFloatingWindow>() == null )
+       && ( anchorableActive != null ) )
+      {
+        anchorableActive.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.AnchorablePaneDockBottom:
@@ -231,8 +237,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
           }
           break;
         #endregion
-
-
         case DropTargetType.AnchorablePaneDockInside:
           #region DropTargetType.AnchorablePaneDockInside
           {
@@ -250,8 +254,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
           }
           break;
           #endregion
-
-
       }
 
       anchorableActive.IsActive = true;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs
index 282490bf..2160a7a7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTabPanel.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,9 +17,8 @@
 
 using System;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
-using Xceed.Wpf.AvalonDock.Layout;
+using System.Windows.Controls;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs
index 3ecb941e..ffdea2f6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AnchorablePaneTitle.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,8 +16,8 @@
   ***********************************************************************************/
 
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using Xceed.Wpf.AvalonDock.Layout;
 
@@ -53,7 +53,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// <summary>
     /// Model Dependency Property
     /// </summary>
-    public static readonly DependencyProperty ModelProperty =  DependencyProperty.Register( "Model", typeof( LayoutAnchorable ), typeof( AnchorablePaneTitle ),
+    public static readonly DependencyProperty ModelProperty = DependencyProperty.Register( "Model", typeof( LayoutAnchorable ), typeof( AnchorablePaneTitle ),
             new FrameworkPropertyMetadata( ( LayoutAnchorable )null, new PropertyChangedCallback( _OnModelChanged ) ) );
 
     /// <summary>
@@ -99,10 +99,10 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// <summary>
     /// LayoutItem Read-Only Dependency Property
     /// </summary>
-    private static readonly DependencyPropertyKey LayoutItemPropertyKey  = DependencyProperty.RegisterReadOnly( "LayoutItem", typeof( LayoutItem ), typeof( AnchorablePaneTitle ),
+    private static readonly DependencyPropertyKey LayoutItemPropertyKey = DependencyProperty.RegisterReadOnly( "LayoutItem", typeof( LayoutItem ), typeof( AnchorablePaneTitle ),
             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 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs
index e413c9ff..28d4d862 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/AutoHideWindowManager.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs
index 61bc43e9..fbd3d2de 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/BindingHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,8 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 using System.ComponentModel;
+using System.Windows;
 using System.Windows.Data;
 using System.Windows.Threading;
 
@@ -42,8 +42,8 @@ namespace Xceed.Wpf.AvalonDock.Controls
               // Ensure that no pending calls are in the dispatcher queue
               Dispatcher.CurrentDispatcher.BeginInvoke( DispatcherPriority.SystemIdle, ( Action )delegate
                  {
-                              // Remove and add the binding to re-trigger the binding error
-                              dependencyObject.ClearValue( dpd.DependencyProperty );
+                   // Remove and add the binding to re-trigger the binding error
+                   dependencyObject.ClearValue( dpd.DependencyProperty );
                    BindingOperations.SetBinding( dependencyObject, dpd.DependencyProperty, binding.ParentBindingBase );
                  } );
             }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs
index c0cc99cb..6936da99 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ContextMenuEx.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs
index 422bef2f..5d9ba5ca 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerDropTarget.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -45,6 +45,14 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     protected override void Drop( LayoutAnchorableFloatingWindow floatingWindow )
     {
+      if( ( floatingWindow != null )
+       && ( floatingWindow.Root != null )
+       && ( floatingWindow.Root.ActiveContent != null ) )
+      {
+        var currentActiveContent = floatingWindow.Root.ActiveContent;
+        currentActiveContent.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.DockingManagerDockLeft:
@@ -236,7 +244,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
           #endregion
       }
 
-
       base.Drop( floatingWindow );
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs
index 77191380..2e9d7ad1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DockingManagerOverlayArea.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs
index 933eb7d2..ac806923 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneControlOverlayArea.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -35,7 +35,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         : base( overlayWindow )
     {
       _documentPaneControl = documentPaneControl;
-      base.SetScreenDetectionArea( new Rect(  _documentPaneControl.PointToScreenDPI( new Point() ),  _documentPaneControl.TransformActualSizeToAncestor() ) );
+      base.SetScreenDetectionArea( new Rect( _documentPaneControl.PointToScreenDPI( new Point() ), _documentPaneControl.TransformActualSizeToAncestor() ) );
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs
index de1296f6..add66502 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropAsAnchorableTarget.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -58,6 +58,15 @@ namespace Xceed.Wpf.AvalonDock.Controls
       LayoutPanel parentGroupPanel;
       FindParentLayoutDocumentPane( targetModel, out parentGroup, out parentGroupPanel );
 
+      if( ( targetModel.FindParent<LayoutFloatingWindow>() == null )
+       && ( floatingWindow != null )
+       && ( floatingWindow.Root != null )
+       && ( floatingWindow.Root.ActiveContent != null ) )
+      {
+        var currentActiveContent = floatingWindow.Root.ActiveContent;
+        currentActiveContent.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.DocumentPaneDockAsAnchorableBottom:
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs
index 153eef3d..683d7326 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneDropTarget.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -55,6 +55,15 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       ILayoutDocumentPane targetModel = _targetPane.Model as ILayoutDocumentPane;
 
+      if( ( targetModel.FindParent<LayoutFloatingWindow>() == null )
+       && ( floatingWindow != null )
+       && ( floatingWindow.Root != null )
+       && ( floatingWindow.Root.ActiveContent != null ) )
+      {
+        var currentActiveContent = floatingWindow.Root.ActiveContent;
+        currentActiveContent.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.DocumentPaneDockBottom:
@@ -205,7 +214,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
               if( targetPane.DockWidth.IsStar )
               {
                 targetPane.DockWidth = new GridLength( targetPane.DockWidth.Value / 2d, GridUnitType.Star );
-                newLayoutDocumentPane.DockWidth = targetPane.DockWidth;                
+                newLayoutDocumentPane.DockWidth = targetPane.DockWidth;
               }
             }
             var parentModel = targetModel.Parent as LayoutDocumentPaneGroup;
@@ -240,7 +249,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
           }
           break;
         #endregion
-
         case DropTargetType.DocumentPaneDockInside:
           #region DropTargetType.DocumentPaneDockInside
           {
@@ -269,8 +277,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
           }
           break;
           #endregion
-
-
       }
 
       base.Drop( floatingWindow );
@@ -280,6 +286,15 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       ILayoutDocumentPane targetModel = _targetPane.Model as ILayoutDocumentPane;
 
+      if( ( targetModel.FindParent<LayoutFloatingWindow>() == null )
+       && ( floatingWindow != null )
+       && ( floatingWindow.Root != null )
+       && ( floatingWindow.Root.ActiveContent != null ) )
+      {
+        var currentActiveContent = floatingWindow.Root.ActiveContent;
+        currentActiveContent.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.DocumentPaneDockBottom:
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs
index cc43cec4..74761643 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneGroupDropTarget.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -46,6 +46,15 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       ILayoutPane targetModel = _targetPane.Model as ILayoutPane;
 
+      if( ( targetModel.FindParent<LayoutFloatingWindow>() == null )
+      && ( floatingWindow != null )
+      && ( floatingWindow.Root != null )
+      && ( floatingWindow.Root.ActiveContent != null ) )
+      {
+        var currentActiveContent = floatingWindow.Root.ActiveContent;
+        currentActiveContent.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.DocumentPaneGroupDockInside:
@@ -60,6 +69,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
           break;
           #endregion
       }
+
       base.Drop( floatingWindow );
     }
 
@@ -67,6 +77,15 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       ILayoutPane targetModel = _targetPane.Model as ILayoutPane;
 
+      if( ( targetModel.FindParent<LayoutFloatingWindow>() == null )
+       && ( floatingWindow != null )
+       && ( floatingWindow.Root != null )
+       && ( floatingWindow.Root.ActiveContent != null ) )
+      {
+        var currentActiveContent = floatingWindow.Root.ActiveContent;
+        currentActiveContent.IsFloating = false;
+      }
+
       switch( Type )
       {
         case DropTargetType.DocumentPaneGroupDockInside:
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs
index 728f2eb1..e7c83a69 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DocumentPaneTabPanel.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,8 +17,8 @@
 
 using System;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
@@ -60,7 +60,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         if( skipAllOthers || offset + doc.DesiredSize.Width > finalSize.Width )
         {
           var layoutContent = doc.Content as LayoutContent;
-          if( (layoutContent != null) && layoutContent.IsSelected && !doc.IsVisible )
+          if( ( layoutContent != null ) && layoutContent.IsSelected && !doc.IsVisible )
           {
             var parentContainer = layoutContent.Parent as ILayoutContainer;
             var parentSelector = layoutContent.Parent as ILayoutContentSelector;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs
index c083b23e..98162671 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DragService.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -192,8 +192,8 @@ namespace Xceed.Wpf.AvalonDock.Controls
     #region Private Methods
 
     private void GetOverlayWindowHosts()
-    {      
-      var windows = _manager.GetWindowsByZOrder().Where( w => (w != _floatingWindow) && w.IsVisible );
+    {
+      var windows = _manager.GetWindowsByZOrder().Where( w => ( w != _floatingWindow ) && w.IsVisible );
 
       foreach( var w in windows )
       {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs
index d851b414..89eb4055 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropArea.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -69,7 +69,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         return _detectionRect;
       }
-    }   
+    }
 
     public DropAreaType Type
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs
index 0ef7d145..ed514268 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownButton.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,9 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls.Primitives;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -39,8 +39,8 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// <summary>
     /// DropDownContextMenu Dependency Property
     /// </summary>
-    public static readonly DependencyProperty DropDownContextMenuProperty =  DependencyProperty.Register( "DropDownContextMenu", typeof( ContextMenu ), typeof( DropDownButton ),
-            new FrameworkPropertyMetadata( ( ContextMenu )null,  new PropertyChangedCallback( OnDropDownContextMenuChanged ) ) );
+    public static readonly DependencyProperty DropDownContextMenuProperty = DependencyProperty.Register( "DropDownContextMenu", typeof( ContextMenu ), typeof( DropDownButton ),
+            new FrameworkPropertyMetadata( ( ContextMenu )null, new PropertyChangedCallback( OnDropDownContextMenuChanged ) ) );
 
     /// <summary>
     /// Gets or sets the DropDownContextMenu property.  This dependency property 
@@ -83,7 +83,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// <summary>
     /// DropDownContextMenuDataContext Dependency Property
     /// </summary>
-    public static readonly DependencyProperty DropDownContextMenuDataContextProperty =  DependencyProperty.Register( "DropDownContextMenuDataContext", typeof( object ), typeof( DropDownButton ),
+    public static readonly DependencyProperty DropDownContextMenuDataContextProperty = DependencyProperty.Register( "DropDownContextMenuDataContext", typeof( object ), typeof( DropDownButton ),
             new FrameworkPropertyMetadata( ( object )null ) );
 
     /// <summary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs
index aabdc86e..594be3ca 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropDownControlArea.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs
index 624dcb9f..b458838f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTarget.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -20,9 +20,8 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using Xceed.Wpf.AvalonDock.Layout;
 using System.Windows.Threading;
-using System.Windows.Input;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -70,7 +69,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         return _targetElement;
       }
-    }    
+    }
 
     public DropTargetType Type
     {
@@ -119,7 +118,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
               currentActiveContent.IsSelected = false;
               currentActiveContent.IsActive = false;
               currentActiveContent.IsActive = true;
-              currentActiveContent.IsFloating = false;
             } ), DispatcherPriority.Background );
       }
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs
index 0a29d1b2..f0a732a3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs
index ef6e5f7d..2e17c608 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/DropTargetType.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Extentions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Extentions.cs
index 991659e3..05a68083 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Extentions.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Extentions.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs
index 5b6e4700..99597993 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FocusElementManager.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,15 +17,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using System.Reflection;
+using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
-using System.Windows;
-using System.Diagnostics;
-using Xceed.Wpf.AvalonDock.Layout;
 using System.Windows.Media;
 using System.Windows.Threading;
-using System.Reflection;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs
index c2e10426..a3300e95 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/FullWeakDictionary.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs
index 04c42c74..ce2d6146 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IDropTarget.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs
index b9e1bfdb..5521eed7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindow.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs
index d406d73a..f46952cf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowArea.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs
index c73acb16..f10e2f8a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowDropTarget.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs
index 02ee27bd..d1bbe0cc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/IOverlayWindowHost.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs
index cfb07aaf..87df2564 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs
index dc05fce8..25c35b79 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorGroupControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,12 +15,12 @@
 
   ***********************************************************************************/
 
-using System.Linq;
-using System.Windows.Controls;
 using System.Collections.ObjectModel;
-using Xceed.Wpf.AvalonDock.Layout;
+using System.Linq;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Data;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs
index f1c88ab3..3c020c13 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorSideControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs
index aaf67005..eaad3349 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -45,7 +45,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// <summary>
     /// Model Dependency Property
     /// </summary>
-    public static readonly DependencyProperty ModelProperty =  DependencyProperty.Register( "Model", typeof( LayoutAnchorable ), typeof( LayoutAnchorableControl ),
+    public static readonly DependencyProperty ModelProperty = DependencyProperty.Register( "Model", typeof( LayoutAnchorable ), typeof( LayoutAnchorableControl ),
             new FrameworkPropertyMetadata( ( LayoutAnchorable )null, new PropertyChangedCallback( OnModelChanged ) ) );
 
     /// <summary>
@@ -82,7 +82,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         ( ( LayoutContent )e.OldValue ).PropertyChanged -= this.Model_PropertyChanged;
       }
 
-      if( ( this.Model != null) && ( this.Model.Root != null ) && ( this.Model.Root.Manager != null ) )
+      if( ( this.Model != null ) && ( this.Model.Root != null ) && ( this.Model.Root.Manager != null ) )
       {
         this.Model.PropertyChanged += this.Model_PropertyChanged;
         this.SetLayoutItem( this.Model.Root.Manager.GetLayoutItemFromModel( this.Model ) );
@@ -158,7 +158,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         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 f1a9563e..b8d3b7ee 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableFloatingWindowControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,17 +15,17 @@
 
   ***********************************************************************************/
 
+using Microsoft.Windows.Shell;
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
+using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Input;
-using Xceed.Wpf.AvalonDock.Layout;
-using Xceed.Wpf.AvalonDock.Converters;
-using System.Windows.Controls.Primitives;
 using Xceed.Wpf.AvalonDock.Commands;
-using Microsoft.Windows.Shell;
+using Xceed.Wpf.AvalonDock.Converters;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -143,9 +143,9 @@ namespace Xceed.Wpf.AvalonDock.Controls
         _overlayWindow = null;
       }
 
-      base.OnClosed( e );      
+      base.OnClosed( e );
 
-      _model.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler( _model_PropertyChanged );      
+      _model.PropertyChanged -= new System.ComponentModel.PropertyChangedEventHandler( _model_PropertyChanged );
       IsVisibleChanged -= this.LayoutAnchorableFloatingWindowControl_IsVisibleChanged;
       BindingOperations.ClearBinding( this, VisibilityProperty );
       BindingOperations.ClearBinding( this, SingleContentLayoutItemProperty );
@@ -336,7 +336,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     private bool CanExecuteHideWindowCommand( object parameter )
     {
-      return this.CanHide( parameter );     
+      return this.CanHide( parameter );
     }
 
     private void OnExecuteHideWindowCommand( object parameter )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs
index 05ad414c..adc07526 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableItem.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,11 +16,11 @@
   ***********************************************************************************/
 
 using System;
-using Xceed.Wpf.AvalonDock.Layout;
-using System.Windows.Input;
 using System.Windows;
-using Xceed.Wpf.AvalonDock.Commands;
 using System.Windows.Data;
+using System.Windows.Input;
+using Xceed.Wpf.AvalonDock.Commands;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
index c9ff6860..6dc97eb7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,7 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows.Controls;
 using System.Windows;
 using System.Windows.Data;
 using Xceed.Wpf.AvalonDock.Layout;
@@ -113,7 +112,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
             _model.SelectedContent.IsActive = true;
           }
         }
-      }       
+      }
     }
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs
index 572b0fee..a51c9a3f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorablePaneGroupControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,8 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs
index e0b88aad..99a908e0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAnchorableTabItem.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -193,9 +193,9 @@ namespace Xceed.Wpf.AvalonDock.Controls
               _mouseLastChangePositionX = currentTabScreenArea.Left + ( currentTabScreenArea.Width / 2 );
             }
 
-            if( ( containerPane is LayoutAnchorablePane ) && !( (LayoutAnchorablePane)containerPane ).CanRepositionItems )
+            if( ( containerPane is LayoutAnchorablePane ) && !( ( LayoutAnchorablePane )containerPane ).CanRepositionItems )
               return;
-            if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutAnchorablePaneGroup ) && !( (LayoutAnchorablePaneGroup)containerPane.Parent ).CanRepositionItems )
+            if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutAnchorablePaneGroup ) && !( ( LayoutAnchorablePaneGroup )containerPane.Parent ).CanRepositionItems )
               return;
 
             var childrenList = container.Children.ToList();
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs
index 3f628d8a..c95f0498 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutAutoHideWindowControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,12 +17,12 @@
 
 using System;
 using System.Linq;
-using System.Windows.Interop;
-using System.Windows.Controls;
 using System.Runtime.InteropServices;
 using System.Windows;
-using System.Windows.Input;
+using System.Windows.Controls;
 using System.Windows.Data;
+using System.Windows.Input;
+using System.Windows.Interop;
 using System.Windows.Media;
 using Xceed.Wpf.AvalonDock.Layout;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutCachePaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutCachePaneControl.cs
index 2d23853a..733d6518 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutCachePaneControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutCachePaneControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,10 +17,10 @@
 
 
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
-using System.Linq;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
@@ -61,6 +61,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
 
 
+
 
 
     #endregion
@@ -100,6 +101,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
 
 
+
 
 
   }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs
index 2e5f0b4f..ab5b8a8b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -119,7 +119,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// LayoutItem Read-Only Dependency Property
     /// </summary>
     private static readonly DependencyPropertyKey LayoutItemPropertyKey = DependencyProperty.RegisterReadOnly( "LayoutItem", typeof( LayoutItem ), typeof( LayoutDocumentControl ),
-      new FrameworkPropertyMetadata(( LayoutItem )null ) );
+      new FrameworkPropertyMetadata( ( LayoutItem )null ) );
 
     public static readonly DependencyProperty LayoutItemProperty = LayoutItemPropertyKey.DependencyProperty;
 
@@ -153,7 +153,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     protected override void OnPreviewGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
     {
-      var setIsActive = !( (e.NewFocus != null) && (e.OldFocus != null) && (e.OldFocus is LayoutFloatingWindowControl) );
+      var setIsActive = !( ( e.NewFocus != null ) && ( e.OldFocus != null ) && ( e.OldFocus is LayoutFloatingWindowControl ) );
       if( setIsActive )
       {
         this.SetIsActive();
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
index c66e5100..aa537acd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentFloatingWindowControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,12 +15,12 @@
 
   ***********************************************************************************/
 
+using Microsoft.Windows.Shell;
 using System;
-using Xceed.Wpf.AvalonDock.Layout;
+using System.Linq;
 using System.Windows;
 using System.Windows.Controls.Primitives;
-using Microsoft.Windows.Shell;
-using System.Linq;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs
index b199b6e9..3945011f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentItem.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,11 @@
 
   ***********************************************************************************/
 
-using Xceed.Wpf.AvalonDock.Layout;
 using System.Windows;
-using Xceed.Wpf.AvalonDock.Commands;
-using System.Windows.Input;
 using System.Windows.Data;
+using System.Windows.Input;
+using Xceed.Wpf.AvalonDock.Commands;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -98,7 +98,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     protected override void OnVisibilityChanged()
     {
-      if( (_document != null) && (_document.Root != null) )
+      if( ( _document != null ) && ( _document.Root != null ) )
       {
         _document.IsVisible = ( this.Visibility == Visibility.Visible );
 
@@ -141,6 +141,6 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
 
 
-#endregion
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs
index 00cf0600..b8c0bce6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -105,7 +105,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
             _model.SelectedContent.IsActive = true;
           }
         }
-      }       
+      }
     }
 
     protected override void OnMouseRightButtonDown( System.Windows.Input.MouseButtonEventArgs e )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs
index 88c01dfa..220060a3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentPaneGroupControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,8 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs
index d3286ab4..bcb10b75 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutDocumentTabItem.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -63,7 +63,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// <summary>
     /// Model Dependency Property
     /// </summary>
-    public static readonly DependencyProperty ModelProperty =  DependencyProperty.Register( "Model", typeof( LayoutContent ), typeof( LayoutDocumentTabItem ),
+    public static readonly DependencyProperty ModelProperty = DependencyProperty.Register( "Model", typeof( LayoutContent ), typeof( LayoutDocumentTabItem ),
             new FrameworkPropertyMetadata( ( LayoutContent )null, new PropertyChangedCallback( OnModelChanged ) ) );
 
     /// <summary>
@@ -201,9 +201,9 @@ namespace Xceed.Wpf.AvalonDock.Controls
               _mouseLastChangePositionX = currentTabScreenArea.Left + ( currentTabScreenArea.Width / 2 );
             }
 
-            if( ( containerPane is LayoutDocumentPane ) && !( (LayoutDocumentPane)containerPane ).CanRepositionItems )
+            if( ( containerPane is LayoutDocumentPane ) && !( ( LayoutDocumentPane )containerPane ).CanRepositionItems )
               return;
-            if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutDocumentPaneGroup ) && !( (LayoutDocumentPaneGroup)containerPane.Parent ).CanRepositionItems )
+            if( ( containerPane.Parent != null ) && ( containerPane.Parent is LayoutDocumentPaneGroup ) && !( ( LayoutDocumentPaneGroup )containerPane.Parent ).CanRepositionItems )
               return;
 
             var childrenList = container.Children.ToList();
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
index 48d107ad..049a8fe5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutFloatingWindowControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -21,13 +21,10 @@ using System.Windows;
 using System.Runtime.InteropServices;
 using System.Windows.Interop;
 using System.Windows.Input;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Media;
 using Xceed.Wpf.AvalonDock.Layout;
-using System.Windows.Documents;
 using Xceed.Wpf.AvalonDock.Themes;
 using Standard;
+using System.Windows.Threading;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -291,7 +288,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         root.FloatingWindows.Remove( this.Model as LayoutFloatingWindow );
       }
 
-      this.BringFocusOnDockingManager();  
+      this.BringFocusOnDockingManager();
     }
 
     protected override void OnInitialized( EventArgs e )
@@ -413,7 +410,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
           if( wParam != IntPtr.Zero )
           {
             handled = true;
-            var client = (RECT)Marshal.PtrToStructure( lParam, typeof( RECT ) );
+            var client = ( RECT )Marshal.PtrToStructure( lParam, typeof( RECT ) );
             client.Bottom -= 1;
             Marshal.StructureToPtr( client, lParam, false );
           }
@@ -438,7 +435,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         //  break;
 
         case Win32Helper.WM_ACTIVATE:
-          if( ( (int)wParam & 0xFFFF ) == Win32Helper.WA_INACTIVE )
+          if( ( ( int )wParam & 0xFFFF ) == Win32Helper.WA_INACTIVE )
           {
             if( lParam == this.GetParentWindowHandle() )
             {
@@ -481,7 +478,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
           }
           break;
         case Win32Helper.WM_SYSCOMMAND:
-          int command = (int)wParam & 0xFFF0;
+          int command = ( int )wParam & 0xFFF0;
           if( command == Win32Helper.SC_MAXIMIZE || command == Win32Helper.SC_RESTORE )
           {
             UpdateMaximizedState( command == Win32Helper.SC_MAXIMIZE );
@@ -500,7 +497,13 @@ namespace Xceed.Wpf.AvalonDock.Controls
       if( !_isClosing )
       {
         _isClosing = true;
-        this.Close();
+
+        // Added Dispatcher to prevent InvalidOperationException issue in reference to bug case 
+        // DevOps #2106
+        Dispatcher.BeginInvoke( new Action( () =>
+        {
+          this.Close();
+        } ), DispatcherPriority.Send );
       }
     }
 
@@ -513,8 +516,8 @@ namespace Xceed.Wpf.AvalonDock.Controls
       }
       else
       {
-        if( (this.Model != null) && ( this.Model.Root != null) && ( this.Model.Root.Manager != null ) )
-        {                
+        if( ( this.Model != null ) && ( this.Model.Root != null ) && ( this.Model.Root.Manager != null ) )
+        {
           var firstUIElement = this.Model.Root.Manager.FindVisualChildren<UIElement>().Where( control => control.Focusable ).FirstOrDefault();
           if( firstUIElement != null )
           {
@@ -547,7 +550,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     private void LayoutFloatingWindowControl_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
     {
-      if( (bool)e.NewValue )
+      if( ( bool )e.NewValue )
       {
       }
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs
index 4ec5413f..bf2e362c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,12 +17,12 @@
 
 using System;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
-using Xceed.Wpf.AvalonDock.Layout;
 using System.Windows.Threading;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
@@ -68,7 +68,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         return _model;
       }
-    }   
+    }
 
     public Orientation Orientation
     {
@@ -76,7 +76,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         return ( _model as ILayoutOrientableGroup ).Orientation;
       }
-    } 
+    }
 
     private bool AsyncRefreshCalled
     {
@@ -405,11 +405,11 @@ namespace Xceed.Wpf.AvalonDock.Controls
       var nextChild = GetNextVisibleChild( indexOfResizer );
 
       var prevChildActualSize = prevChild.TransformActualSizeToAncestor();
-      var nextChildActualSize = (nextChild != null) ? nextChild.TransformActualSizeToAncestor() : new Size();
-      var totalActualSize = new Size(prevChildActualSize.Width + nextChildActualSize.Width, prevChildActualSize.Height + nextChildActualSize.Height );
+      var nextChildActualSize = ( nextChild != null ) ? nextChild.TransformActualSizeToAncestor() : new Size();
+      var totalActualSize = new Size( prevChildActualSize.Width + nextChildActualSize.Width, prevChildActualSize.Height + nextChildActualSize.Height );
 
       var prevChildModel = ( ILayoutPositionableElement )( prevChild as ILayoutControl ).Model;
-      var nextChildModel = (nextChild != null) ? ( ILayoutPositionableElement )( nextChild as ILayoutControl ).Model : null;
+      var nextChildModel = ( nextChild != null ) ? ( ILayoutPositionableElement )( nextChild as ILayoutControl ).Model : null;
       var totalStarSize = new Size( prevChildModel.DockWidth.IsStar && nextChildModel.DockWidth.IsStar ? prevChildModel.DockWidth.Value + nextChildModel.DockWidth.Value : 1d,
                                     prevChildModel.DockHeight.IsStar && nextChildModel.DockHeight.IsStar ? prevChildModel.DockHeight.Value + nextChildModel.DockHeight.Value : 1d );
 
@@ -417,7 +417,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         if( prevChildModel.DockWidth.IsStar )
         {
-          prevChildModel.DockWidth = new GridLength( ((prevChildActualSize.Width + delta) / totalActualSize.Width) * totalStarSize.Width, GridUnitType.Star );
+          prevChildModel.DockWidth = new GridLength( ( ( prevChildActualSize.Width + delta ) / totalActualSize.Width ) * totalStarSize.Width, GridUnitType.Star );
         }
         else
         {
@@ -431,7 +431,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         {
           if( nextChildModel.DockWidth.IsStar )
           {
-            nextChildModel.DockWidth = new GridLength( ((nextChildActualSize.Width - delta) / totalActualSize.Width) * totalStarSize.Width, GridUnitType.Star );
+            nextChildModel.DockWidth = new GridLength( ( ( nextChildActualSize.Width - delta ) / totalActualSize.Width ) * totalStarSize.Width, GridUnitType.Star );
           }
           else
           {
@@ -446,7 +446,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         if( prevChildModel.DockHeight.IsStar )
         {
-          prevChildModel.DockHeight = new GridLength( ((prevChildActualSize.Height + delta) / totalActualSize.Height) * totalStarSize.Height, GridUnitType.Star );
+          prevChildModel.DockHeight = new GridLength( ( ( prevChildActualSize.Height + delta ) / totalActualSize.Height ) * totalStarSize.Height, GridUnitType.Star );
         }
         else
         {
@@ -460,7 +460,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         {
           if( nextChildModel.DockHeight.IsStar )
           {
-            nextChildModel.DockHeight = new GridLength( ((nextChildActualSize.Height - delta) / totalActualSize.Height) * totalStarSize.Height, GridUnitType.Star );
+            nextChildModel.DockHeight = new GridLength( ( ( nextChildActualSize.Height - delta ) / totalActualSize.Height ) * totalStarSize.Height, GridUnitType.Star );
           }
           else
           {
@@ -511,10 +511,10 @@ namespace Xceed.Wpf.AvalonDock.Controls
       var nextChild = GetNextVisibleChild( indexOfResizer );
 
       var prevChildActualSize = prevChild.TransformActualSizeToAncestor();
-      var nextChildActualSize = (nextChild != null) ? nextChild.TransformActualSizeToAncestor() : new Size();
+      var nextChildActualSize = ( nextChild != null ) ? nextChild.TransformActualSizeToAncestor() : new Size();
 
       var prevChildModel = ( ILayoutPositionableElement )( prevChild as ILayoutControl ).Model;
-      var nextChildModel = (nextChild != null) ? ( ILayoutPositionableElement )( nextChild as ILayoutControl ).Model : null;
+      var nextChildModel = ( nextChild != null ) ? ( ILayoutPositionableElement )( nextChild as ILayoutControl ).Model : null;
 
       Point ptTopLeftScreen = prevChild.PointToScreenDPIWithoutFlowDirection( new Point() );
 
@@ -522,7 +522,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
       if( Orientation == System.Windows.Controls.Orientation.Horizontal )
       {
-        var nextChildDockMinWidth = (nextChildModel != null) ? nextChildModel.DockMinWidth : 0d;
+        var nextChildDockMinWidth = ( nextChildModel != null ) ? nextChildModel.DockMinWidth : 0d;
 
         actualSize = new Size(
             prevChildActualSize.Width - prevChildModel.DockMinWidth + splitter.ActualWidth + nextChildActualSize.Width - nextChildDockMinWidth,
@@ -589,7 +589,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       _resizerWindowHost.Show();
     }
 
-    private  void HideResizerOverlayWindow()
+    private void HideResizerOverlayWindow()
     {
       if( _resizerWindowHost != null )
       {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs
index df11a318..7772fb73 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutGridResizerControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,8 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls.Primitives;
 using System.Windows;
+using System.Windows.Controls.Primitives;
 using System.Windows.Media;
 
 namespace Xceed.Wpf.AvalonDock.Controls
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
index d5471b49..ec03f39c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutItem.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -18,12 +18,12 @@
 using System;
 using System.Linq;
 using System.Windows;
-using Xceed.Wpf.AvalonDock.Layout;
-using System.Windows.Input;
-using Xceed.Wpf.AvalonDock.Commands;
+using System.Windows.Controls;
 using System.Windows.Data;
+using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Controls;
+using Xceed.Wpf.AvalonDock.Commands;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs
index 428b528e..3feea236 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/LayoutPanelControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Windows.Controls;
-using System.Windows;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Controls
@@ -46,7 +43,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     protected override void OnFixChildrenDockLengths()
     {
       //               This is because the commented part is setting DockWidth of children....strange code.
-       return;
+      return;
 
       //if (ActualWidth == 0.0 ||
       //    ActualHeight == 0.0)
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs
index abb62f17..7de333eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/MenuItemEx.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,8 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace Xceed.Wpf.AvalonDock.Controls
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs
index 6daccdf7..df3c8f65 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/NavigatorWindow.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -60,16 +60,16 @@ namespace Xceed.Wpf.AvalonDock.Controls
       _manager = manager;
 
       _internalSetSelectedDocument = true;
-      this.SetAnchorables( _manager.Layout.Descendents().OfType<LayoutAnchorable>().Where( a => a.IsVisible && a.IsEnabled).Select( d => (LayoutAnchorableItem)_manager.GetLayoutItemFromModel( d ) ).ToArray() );
-      this.SetDocuments( _manager.Layout.Descendents().OfType<LayoutDocument>().Where( d => d.IsEnabled ).OrderByDescending( d => d.LastActivationTimeStamp.GetValueOrDefault() ).Select( d => (LayoutDocumentItem)_manager.GetLayoutItemFromModel( d ) ).ToArray() );
+      this.SetAnchorables( _manager.Layout.Descendents().OfType<LayoutAnchorable>().Where( a => a.IsVisible && a.IsEnabled ).Select( d => ( LayoutAnchorableItem )_manager.GetLayoutItemFromModel( d ) ).ToArray() );
+      this.SetDocuments( _manager.Layout.Descendents().OfType<LayoutDocument>().Where( d => d.IsEnabled ).OrderByDescending( d => d.LastActivationTimeStamp.GetValueOrDefault() ).Select( d => ( LayoutDocumentItem )_manager.GetLayoutItemFromModel( d ) ).ToArray() );
       _internalSetSelectedDocument = false;
 
-      if( ( this.Documents != null) && (this.Documents.Length > 1) )
+      if( ( this.Documents != null ) && ( this.Documents.Length > 1 ) )
       {
         this.InternalSetSelectedDocument( this.Documents[ 1 ] );
         _isSelectingDocument = true;
       }
-      else if( (this.Anchorables != null) && (this.Anchorables.Count() > 1) )
+      else if( ( this.Anchorables != null ) && ( this.Anchorables.Count() > 1 ) )
       {
         this.InternalSetSelectedAnchorable( this.Anchorables.ToArray()[ 1 ] );
         _isSelectingDocument = false;
@@ -105,7 +105,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       get
       {
-        return (LayoutDocumentItem[])GetValue( DocumentsProperty );
+        return ( LayoutDocumentItem[] )GetValue( DocumentsProperty );
       }
     }
 
@@ -117,7 +117,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// Anchorables Read-Only Dependency Property
     /// </summary>
     private static readonly DependencyPropertyKey AnchorablesPropertyKey = DependencyProperty.RegisterReadOnly( "Anchorables", typeof( IEnumerable<LayoutAnchorableItem> ), typeof( NavigatorWindow ),
-            new FrameworkPropertyMetadata( (IEnumerable<LayoutAnchorableItem>)null ) );
+            new FrameworkPropertyMetadata( ( IEnumerable<LayoutAnchorableItem> )null ) );
 
     public static readonly DependencyProperty AnchorablesProperty = AnchorablesPropertyKey.DependencyProperty;
 
@@ -129,7 +129,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       get
       {
-        return (IEnumerable<LayoutAnchorableItem>)GetValue( AnchorablesProperty );
+        return ( IEnumerable<LayoutAnchorableItem> )GetValue( AnchorablesProperty );
       }
     }
 
@@ -141,7 +141,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// SelectedDocument Dependency Property
     /// </summary>
     public static readonly DependencyProperty SelectedDocumentProperty = DependencyProperty.Register( "SelectedDocument", typeof( LayoutDocumentItem ), typeof( NavigatorWindow ),
-            new FrameworkPropertyMetadata( (LayoutDocumentItem)null, new PropertyChangedCallback( OnSelectedDocumentChanged ) ) );
+            new FrameworkPropertyMetadata( ( LayoutDocumentItem )null, new PropertyChangedCallback( OnSelectedDocumentChanged ) ) );
 
     /// <summary>
     /// Gets or sets the SelectedDocument property.  This dependency property 
@@ -151,7 +151,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       get
       {
-        return (LayoutDocumentItem)GetValue( SelectedDocumentProperty );
+        return ( LayoutDocumentItem )GetValue( SelectedDocumentProperty );
       }
       set
       {
@@ -164,7 +164,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// </summary>
     private static void OnSelectedDocumentChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
     {
-      ( (NavigatorWindow)d ).OnSelectedDocumentChanged( e );
+      ( ( NavigatorWindow )d ).OnSelectedDocumentChanged( e );
     }
 
     /// <summary>
@@ -191,7 +191,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// SelectedAnchorable Dependency Property
     /// </summary>
     public static readonly DependencyProperty SelectedAnchorableProperty = DependencyProperty.Register( "SelectedAnchorable", typeof( LayoutAnchorableItem ), typeof( NavigatorWindow ),
-            new FrameworkPropertyMetadata( (LayoutAnchorableItem)null, new PropertyChangedCallback( OnSelectedAnchorableChanged ) ) );
+            new FrameworkPropertyMetadata( ( LayoutAnchorableItem )null, new PropertyChangedCallback( OnSelectedAnchorableChanged ) ) );
 
     /// <summary>
     /// Gets or sets the SelectedAnchorable property.  This dependency property 
@@ -201,7 +201,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     {
       get
       {
-        return (LayoutAnchorableItem)GetValue( SelectedAnchorableProperty );
+        return ( LayoutAnchorableItem )GetValue( SelectedAnchorableProperty );
       }
       set
       {
@@ -214,7 +214,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
     /// </summary>
     private static void OnSelectedAnchorableChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
     {
-      ( (NavigatorWindow)d ).OnSelectedAnchorableChanged( e );
+      ( ( NavigatorWindow )d ).OnSelectedAnchorableChanged( e );
     }
 
     /// <summary>
@@ -236,6 +236,50 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     #endregion
 
+    #region LayoutDocumentsLabel
+
+    public static readonly DependencyProperty LayoutDocumentsLabelProperty = DependencyProperty.Register(
+    "LayoutDocumentsLabel",
+    typeof( string ),
+    typeof( NavigatorWindow ),
+    new FrameworkPropertyMetadata( "Active Files" ) );
+
+    public string LayoutDocumentsLabel
+    {
+      get
+      {
+        return ( string )GetValue( LayoutDocumentsLabelProperty );
+      }
+      set
+      {
+        SetValue( LayoutDocumentsLabelProperty, value );
+      }
+    }
+
+    #endregion // LayoutDocumentsLabel 
+
+    #region LayoutAnchorablesLabel
+
+    public static readonly DependencyProperty LayoutAnchorablesLabelProperty = DependencyProperty.Register(
+    "LayoutAnchorablesLabel",
+    typeof( string ),
+    typeof( NavigatorWindow ),
+    new FrameworkPropertyMetadata( "Active Tool Windows" ) );
+
+    public string LayoutAnchorablesLabel
+    {
+      get
+      {
+        return ( string )GetValue( LayoutAnchorablesLabelProperty );
+      }
+      set
+      {
+        SetValue( LayoutAnchorablesLabelProperty, value );
+      }
+    }
+
+    #endregion // LayoutAnchorablesLabel 
+
     #endregion
 
     #region Overrides   
@@ -262,7 +306,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
         // Selecting LayoutDocuments
         if( _isSelectingDocument )
         {
-          if( (this.SelectedDocument != null) && ( this.Documents != null) )
+          if( ( this.SelectedDocument != null ) && ( this.Documents != null ) )
           {
             var docIndex = this.Documents.IndexOf<LayoutDocumentItem>( this.SelectedDocument );
 
@@ -270,7 +314,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
             {
               // Jump to next LayoutDocument
               if( ( docIndex < ( this.Documents.Length - 1 ) )
-                || (this.Anchorables == null)
+                || ( this.Anchorables == null )
                 || ( this.Anchorables.Count() == 0 ) )
               {
                 this.SelectNextDocument();
@@ -299,7 +343,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
             }
             else if( ( e.Key == System.Windows.Input.Key.Left ) || ( e.Key == System.Windows.Input.Key.Right ) )
             {
-              if( (this.Anchorables != null) && (this.Anchorables.Count() > 0) )
+              if( ( this.Anchorables != null ) && ( this.Anchorables.Count() > 0 ) )
               {
                 _isSelectingDocument = false;
                 this.InternalSetSelectedDocument( null );
@@ -319,7 +363,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
           // There is no SelectedDocument, select the first one.
           else
           {
-            if( ( this.Documents != null ) && (this.Documents.Length > 0) )
+            if( ( this.Documents != null ) && ( this.Documents.Length > 0 ) )
             {
               this.InternalSetSelectedDocument( this.Documents[ 0 ] );
               shouldHandle = true;
@@ -331,19 +375,19 @@ namespace Xceed.Wpf.AvalonDock.Controls
         {
           if( this.SelectedAnchorable != null )
           {
-            var anchorableIndex = ( this.Anchorables != null) ?  this.Anchorables.ToArray().IndexOf<LayoutAnchorableItem>( this.SelectedAnchorable ) : -1;
+            var anchorableIndex = ( this.Anchorables != null ) ? this.Anchorables.ToArray().IndexOf<LayoutAnchorableItem>( this.SelectedAnchorable ) : -1;
 
             if( e.Key == System.Windows.Input.Key.Tab )
             {
               // Jump to next LayoutAnchorable
-              if( ( ( this.Anchorables != null) && ( anchorableIndex < ( this.Anchorables.Count() - 1 ) ) )
+              if( ( ( this.Anchorables != null ) && ( anchorableIndex < ( this.Anchorables.Count() - 1 ) ) )
                 || ( ( this.Documents != null ) && ( this.Documents.Length == 0 ) ) )
               {
                 this.SelectNextAnchorable();
                 shouldHandle = true;
               }
               // Jump to first LayoutDocument
-              else if( ( this.Documents != null) && (this.Documents.Length > 0) )
+              else if( ( this.Documents != null ) && ( this.Documents.Length > 0 ) )
               {
                 _isSelectingDocument = true;
                 this.InternalSetSelectedAnchorable( null );
@@ -365,7 +409,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
             }
             else if( ( e.Key == System.Windows.Input.Key.Left ) || ( e.Key == System.Windows.Input.Key.Right ) )
             {
-              if( ( this.Documents != null) && (this.Documents.Count() > 0) )
+              if( ( this.Documents != null ) && ( this.Documents.Count() > 0 ) )
               {
                 _isSelectingDocument = true;
                 this.InternalSetSelectedAnchorable( null );
@@ -384,7 +428,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
           // There is no SelectedAnchorable, select the first one.
           else
           {
-            if( ( this.Anchorables != null) && (this.Anchorables.Count() > 0) )
+            if( ( this.Anchorables != null ) && ( this.Anchorables.Count() > 0 ) )
             {
               this.InternalSetSelectedAnchorable( this.Anchorables.ToArray()[ 0 ] );
               shouldHandle = true;
@@ -482,7 +526,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
       {
         if( _manager.Theme is DictionaryTheme )
         {
-          currentThemeResourceDictionary = ( (DictionaryTheme)_manager.Theme ).ThemeResourceDictionary;
+          currentThemeResourceDictionary = ( ( DictionaryTheme )_manager.Theme ).ThemeResourceDictionary;
           this.Resources.MergedDictionaries.Add( currentThemeResourceDictionary );
         }
         else
@@ -494,7 +538,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     internal void SelectNextDocument()
     {
-      if( (this.SelectedDocument != null) && ( this.Documents != null) )
+      if( ( this.SelectedDocument != null ) && ( this.Documents != null ) )
       {
         int docIndex = this.Documents.IndexOf<LayoutDocumentItem>( this.SelectedDocument );
         docIndex++;
@@ -508,7 +552,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     internal void SelectPreviousDocument()
     {
-      if( (this.SelectedDocument != null) && ( this.Documents != null) )
+      if( ( this.SelectedDocument != null ) && ( this.Documents != null ) )
       {
         int docIndex = this.Documents.IndexOf<LayoutDocumentItem>( this.SelectedDocument );
         docIndex--;
@@ -522,7 +566,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     internal void SelectNextAnchorable()
     {
-      if( (this.SelectedAnchorable != null) && ( this.Anchorables != null) )
+      if( ( this.SelectedAnchorable != null ) && ( this.Anchorables != null ) )
       {
         var anchorablesArray = this.Anchorables.ToArray();
         int anchorableIndex = anchorablesArray.IndexOf<LayoutAnchorableItem>( this.SelectedAnchorable );
@@ -537,7 +581,7 @@ namespace Xceed.Wpf.AvalonDock.Controls
 
     internal void SelectPreviousAnchorable()
     {
-      if( (this.SelectedAnchorable != null) && ( this.Anchorables != null ) )
+      if( ( this.SelectedAnchorable != null ) && ( this.Anchorables != null ) )
       {
         var anchorablesArray = this.Anchorables.ToArray();
         int anchorableIndex = anchorablesArray.IndexOf<LayoutAnchorableItem>( this.SelectedAnchorable );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs
index 8c4b5c0d..d4b7353c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayArea.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs
index c3127e5f..a5007e36 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindow.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs
index 8342261e..baa95f40 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTarget.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs
index deb1dc04..7423dee6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/OverlayWindowDropTargetType.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs
index 7a795fe2..f0036eae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/ReentrantFlag.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs
index c67833f4..4fe53bc4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ComGuids.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs
index e4c402d3..681572e7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Debug.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs
index 4e5c7a15..2ecc7021 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DoubleUtil.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -18,7 +18,6 @@
 
 namespace Standard
 {
-  using System;
   using System.Diagnostics.CodeAnalysis;
 
   /// <summary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs
index aacca05e..e161dca1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/DpiHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs
index 4bcdf3cc..e6d2cfb8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ErrorCodes.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs
index 47573d1d..70aab6e2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/MessageWindow.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -22,11 +22,11 @@
 namespace Standard
 {
   using System;
+  using System.Collections.Generic;
+  using System.Diagnostics.CodeAnalysis;
   using System.Runtime.InteropServices;
   using System.Windows;
   using System.Windows.Threading;
-  using System.Collections.Generic;
-  using System.Diagnostics.CodeAnalysis;
 
   internal sealed class MessageWindow : DispatcherObject, IDisposable
   {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs
index 1a03eb71..ed367258 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/NativeMethods.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -21,6 +21,7 @@
 
 namespace Standard
 {
+  using Microsoft.Win32.SafeHandles;
   using System;
   using System.ComponentModel;
   using System.Diagnostics.CodeAnalysis;
@@ -30,12 +31,8 @@ namespace Standard
   using System.Runtime.InteropServices.ComTypes;
   using System.Security.Permissions;
   using System.Text;
-  using Microsoft.Win32.SafeHandles;
-
   // Some COM interfaces and Win32 structures are already declared in the framework.
   // Interesting ones to remember in System.Runtime.InteropServices.ComTypes are:
-  using FILETIME = System.Runtime.InteropServices.ComTypes.FILETIME;
-  using IPersistFile = System.Runtime.InteropServices.ComTypes.IPersistFile;
   using IStream = System.Runtime.InteropServices.ComTypes.IStream;
 
   #region Native Values
@@ -1646,9 +1643,9 @@ namespace Standard
     }
   }
 
-#endregion
+  #endregion
 
-#region Native Types
+  #region Native Types
 
   [StructLayout( LayoutKind.Sequential )]
   internal struct BLENDFUNCTION
@@ -1882,7 +1879,7 @@ namespace Standard
       Assert.IsTrue( hr.Succeeded );
     }
 
-#region IDisposable Pattern
+    #region IDisposable Pattern
 
     public void Dispose()
     {
@@ -1901,7 +1898,7 @@ namespace Standard
       Clear();
     }
 
-#endregion
+    #endregion
   }
 
   [SuppressMessage( "Microsoft.Performance", "CA1812:AvoidUninstantiatedInternalClasses" )]
@@ -2464,7 +2461,7 @@ namespace Standard
     public ulong cBuffersEmpty;
   }
 
-#endregion
+  #endregion
 
   /// <summary>Delegate declaration that matches native WndProc signatures.</summary>
   internal delegate IntPtr WndProc( IntPtr hwnd, WM uMsg, IntPtr wParam, IntPtr lParam );
@@ -3460,7 +3457,7 @@ namespace Standard
       }
     }
 
-#region Win7 declarations
+    #region Win7 declarations
 
     [DllImport( "shell32.dll", EntryPoint = "SHAddToRecentDocs" )]
     private static extern void _SHAddToRecentDocs_String( SHARD uFlags, [MarshalAs( UnmanagedType.LPWStr )] string pv );
@@ -3548,6 +3545,6 @@ namespace Standard
     [DllImport( "shell32.dll" )]
     public static extern HRESULT GetCurrentProcessExplicitAppUserModelID( [Out, MarshalAs( UnmanagedType.LPWStr )] out string AppID );
 
-#endregion
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs
index 5d544966..619ea176 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/ShellProvider.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs
index 8af54c8f..7e66dad7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/StreamHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs
index 3320fb69..0b023bc8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Utilities.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -1007,7 +1007,7 @@ namespace Standard
       dpd.RemoveValueChanged( component, listener );
     }
 
-#region Extension Methods
+    #region Extension Methods
 
     public static bool IsThicknessNonNegative( Thickness thickness )
     {
@@ -1069,6 +1069,6 @@ namespace Standard
       return true;
     }
 
-#endregion
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs
index c56c0a6e..6951ee7e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/Standard/Verify.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs
index d9fc0847..e41346b0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemCommands.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -18,11 +18,11 @@
 
 namespace Microsoft.Windows.Shell
 {
+  using Standard;
   using System;
   using System.Windows;
   using System.Windows.Input;
   using System.Windows.Interop;
-  using Standard;
 
   public static class SystemCommands
   {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs
index 2f71ceaa..f4fc1b73 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/SystemParameters2.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -21,6 +21,7 @@
 
 namespace Microsoft.Windows.Shell
 {
+  using Standard;
   using System;
   using System.Collections.Generic;
   using System.ComponentModel;
@@ -28,7 +29,6 @@ namespace Microsoft.Windows.Shell
   using System.Runtime.InteropServices;
   using System.Windows;
   using System.Windows.Media;
-  using Standard;
 
   [SuppressMessage( "Microsoft.Design", "CA1001:TypesThatOwnDisposableFieldsShouldBeDisposable" )]
   public class SystemParameters2 : INotifyPropertyChanged
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs
index b203b8ed..7fc2973e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChrome.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -21,12 +21,12 @@
 
 namespace Microsoft.Windows.Shell
 {
+  using Standard;
   using System;
   using System.Collections.Generic;
   using System.Diagnostics.CodeAnalysis;
   using System.Windows;
   using System.Windows.Data;
-  using Standard;
 
   public class WindowChrome : Freezable
   {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs
index d9c84fc1..fb2c2b16 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/Shell/WindowChromeWorker.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -21,18 +21,17 @@
 
 namespace Microsoft.Windows.Shell
 {
+  using Standard;
   using System;
   using System.Collections.Generic;
   using System.Diagnostics.CodeAnalysis;
   using System.Runtime.InteropServices;
   using System.Windows;
+  using System.Windows.Controls.Primitives;
   using System.Windows.Interop;
   using System.Windows.Media;
   using System.Windows.Threading;
-  using Standard;
-
   using HANDLE_MESSAGE = System.Collections.Generic.KeyValuePair<Standard.WM, Standard.MessageHandler>;
-  using System.Windows.Controls.Primitives;
 
   internal class WindowChromeWorker : DependencyObject
   {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs
index b5e21d63..9af45ea1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/TransformExtentions.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs
index 514ad11d..05bb640b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WeakDictionary.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs
index 5641f843..c62808c2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowActivateEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs
index 06a1a2b4..cfaddf9d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Controls/WindowHookHandler.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs
index e6b0bfc6..8357ee1b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/ActivateCommandLayoutItemFromLayoutModelConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs
index c7a0c350..8fd9ff0d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToAngleConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs
index 11822981..a8e160db 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorSideToOrientationConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,8 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows.Data;
 using System.Windows.Controls;
+using System.Windows.Data;
 using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Converters
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuAutoHideHeaderConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuAutoHideHeaderConverter.cs
index 2139e8af..e1cbdb8e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuAutoHideHeaderConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuAutoHideHeaderConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,8 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows.Data;
 using System.Globalization;
+using System.Windows.Data;
 using Xceed.Wpf.AvalonDock.Properties;
 
 namespace Xceed.Wpf.AvalonDock.Converters
@@ -28,7 +28,7 @@ namespace Xceed.Wpf.AvalonDock.Converters
     {
       var isAutoHidden = value as bool?;
 
-      return (isAutoHidden != null) && isAutoHidden.Value ? Resources.Window_Restore : Resources.Anchorable_AutoHide;
+      return ( isAutoHidden != null ) && isAutoHidden.Value ? Resources.Window_Restore : Resources.Anchorable_AutoHide;
     }
 
     public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs
index 77f016cd..4657aa32 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AnchorableContextMenuHideVisibilityConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs
index 478fb462..a6961499 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/AutoHideCommandLayoutItemFromLayoutModelConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,8 +17,8 @@
 
 using System;
 using System.Windows.Data;
-using Xceed.Wpf.AvalonDock.Layout;
 using Xceed.Wpf.AvalonDock.Controls;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Converters
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs
index 33303213..ac167c20 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/BoolToVisibilityConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,8 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows.Data;
 using System.Windows;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.AvalonDock.Converters
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs
index 9d441690..11917e5a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/HideCommandLayoutItemFromLayoutModelConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,8 +17,8 @@
 
 using System;
 using System.Windows.Data;
-using Xceed.Wpf.AvalonDock.Layout;
 using Xceed.Wpf.AvalonDock.Controls;
+using Xceed.Wpf.AvalonDock.Layout;
 
 namespace Xceed.Wpf.AvalonDock.Converters
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs
index e629d996..18fddab6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/InverseBoolToVisibilityConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,8 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows.Data;
 using System.Windows;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.AvalonDock.Converters
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs
index c601e248..3dac29ce 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/LayoutItemFromLayoutModelConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs
index 6e323883..7038baf6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/NullToDoNothingConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs
index a4c6f7eb..97036902 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Converters/UriSourceToBitmapImageConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,9 @@
   ***********************************************************************************/
 
 using System;
+using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media.Imaging;
-using System.Windows.Controls;
 
 namespace Xceed.Wpf.AvalonDock.Converters
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs
index ad37afa3..2b7f1ccf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DockingManager.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -34,7 +34,6 @@ using Xceed.Wpf.AvalonDock.Themes;
 using System.Diagnostics;
 using System.Windows.Media;
 using System.Windows.Controls.Primitives;
-using System.Globalization;
 
 namespace Xceed.Wpf.AvalonDock
 {
@@ -2348,8 +2347,10 @@ namespace Xceed.Wpf.AvalonDock
       var model = anchorable as LayoutAnchorable;
       if( model != null )
       {
-        model.CloseAnchorable();
-        this.RemoveViewFromLogicalChild( anchorable );
+        if( model.CloseAnchorable() )
+        {
+          this.RemoveViewFromLogicalChild( anchorable );
+        }
       }
     }
 
@@ -2499,7 +2500,14 @@ namespace Xceed.Wpf.AvalonDock
           //fw.Owner = null;
           fw.SetParentWindowToNull();
           fw.KeepContentVisibleOnClose = true;
-          fw.Close();
+
+          // Added Dispatcher to prevent InvalidOperationException issue in reference to bug case 
+          // DevOps #2106
+          Dispatcher.BeginInvoke( new Action( () =>
+          {
+            fw.Close();
+          } ), DispatcherPriority.Send );
+
         }
         _fwList.Clear();
 
@@ -3089,7 +3097,7 @@ namespace Xceed.Wpf.AvalonDock
         for( int i = 0; i < layoutItems.Count(); ++i )
         {
           var itemToRemove = layoutItems[ i ];
-          this.RemoveDocumentLayoutItem(itemToRemove.LayoutElement as LayoutDocument);
+          this.RemoveDocumentLayoutItem( itemToRemove.LayoutElement as LayoutDocument );
         }
       } ) );
     }
@@ -3319,6 +3327,17 @@ namespace Xceed.Wpf.AvalonDock
 
       parentPane.RemoveChildAt( contentModelParentChildrenIndex );
 
+      while( ( parentPane != null ) && ( parentPane.ChildrenCount == 0 ) )
+      {
+        var grandParent = parentPane.Parent as ILayoutPane;
+        if( grandParent != null )
+        {
+          grandParent.RemoveChild( parentPane );
+        }
+
+        parentPane = grandParent;
+      }
+
       double fwWidth = contentModel.FloatingWidth;
       double fwHeight = contentModel.FloatingHeight;
 
@@ -3355,11 +3374,14 @@ namespace Xceed.Wpf.AvalonDock
 
         Layout.FloatingWindows.Add( fw );
 
+        // Must be done after Layout.FloatingWindows.Add( fw ) to be able to modify the values in _dockingManager.Layout.FloatingWindows.CollectionChanged.
+        var fwSize = this.UpdateFloatingDimensions( contentModel, new Size( fwWidth, fwHeight ) );
+
         fwc = new LayoutAnchorableFloatingWindowControl(
             fw as LayoutAnchorableFloatingWindow, isContentImmutable )
         {
-          Width = fwWidth,
-          Height = fwHeight,
+          Width = fwSize.Width,
+          Height = fwSize.Height,
           Left = contentModel.FloatingLeft,
           Top = contentModel.FloatingTop
         };
@@ -3374,11 +3396,14 @@ namespace Xceed.Wpf.AvalonDock
 
         Layout.FloatingWindows.Add( fw );
 
+        // Must be done after Layout.FloatingWindows.Add( fw ) to be able to modify the values in _dockingManager.Layout.FloatingWindows.CollectionChanged.
+        var fwSize = this.UpdateFloatingDimensions( contentModel, new Size( fwWidth, fwHeight ) );
+
         fwc = new LayoutDocumentFloatingWindowControl(
             fw as LayoutDocumentFloatingWindow, isContentImmutable )
         {
-          Width = fwWidth,
-          Height = fwHeight,
+          Width = fwSize.Width,
+          Height = fwSize.Height,
           Left = contentModel.FloatingLeft,
           Top = contentModel.FloatingTop
         };
@@ -3401,6 +3426,16 @@ namespace Xceed.Wpf.AvalonDock
       return fwc;
     }
 
+    private Size UpdateFloatingDimensions( ILayoutElementForFloatingWindow contentModel, Size currentSize )
+    {
+      if( contentModel.FloatingWidth != 0d )
+        currentSize.Width = contentModel.FloatingWidth;
+      if( contentModel.FloatingHeight != 0d )
+        currentSize.Height = contentModel.FloatingHeight;
+
+      return currentSize;
+    }
+
     private void UpdateStarSize( LayoutContent contentModel )
     {
       if( contentModel == null )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs
index 793f54bc..ce89b550 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosedEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs
index fd632169..b05297ba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/DocumentClosingEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Extentions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Extentions.cs
index 55a6cb97..b743ffb8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Extentions.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Extentions.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,8 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
 using System.Collections;
+using System.Collections.Generic;
 
 namespace Xceed.Wpf.AvalonDock
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs
index 975668a4..bf8aa13e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorSide.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs
index 160a70cf..a749cb4c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/AnchorableShowStrategy.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs
index 6d7f4959..5b3fd13e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ChildrenTreeChangedEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs
index 7128646a..71c3d3ac 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Extentions.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -97,7 +97,7 @@ namespace Xceed.Wpf.AvalonDock.Layout
           layoutPanel = parentContainer.FindParent<LayoutPanel>();
         }
 
-        if( (layoutPanel != null) && ( layoutPanel.Children.Count > 0 ) )
+        if( ( layoutPanel != null ) && ( layoutPanel.Children.Count > 0 ) )
         {
           var childrenCount = layoutPanel.Children.Count;
           var currentChildID = -1;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs
index 13c31de0..a0d28c7e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutAnchorablePane.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs
index 53f7012e..7852ed9f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContainer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs
index c9e752e5..82853824 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutContentSelector.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs
index f644126d..0fc2a550 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs
index cec68a20..0e47ad13 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutDocumentPane.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs
index 77a96b65..2f16148f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElement.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs
index ab133fad..23f1ac7a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutElementWithVisibility.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs
index 8173d31d..ca52229f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutGroup.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutInitialContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutInitialContainer.cs
index a2f7ea7b..fe5507b8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutInitialContainer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutInitialContainer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs
index 7dad2b19..a999a67e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutOrientableElement.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs
index 642196a4..e88d66a6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPane.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs
index df31a743..47c78abd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPaneSerializable.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs
index 91354d52..aa29335d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPanelElement.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs
index b4c3f5a8..ca0af389 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPositionableElement.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs
index a81cb47c..4749c706 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutPreviousContainer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs
index ad44ad61..5972a651 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutRoot.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs
index 72b97a6f..695edfa3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/ILayoutUpdateStrategy.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs
index ae32ddb6..93bb27eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorGroup.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs
index 77effd68..14f25b64 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorSide.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs
index a973717f..eb6aed2b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorable.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,12 +16,12 @@
   ***********************************************************************************/
 
 using System;
+using System.ComponentModel;
+using System.Globalization;
 using System.Linq;
 using System.Windows;
-using System.Xml.Serialization;
 using System.Windows.Controls;
-using System.Globalization;
-using System.ComponentModel;
+using System.Xml.Serialization;
 
 namespace Xceed.Wpf.AvalonDock.Layout
 {
@@ -481,7 +481,7 @@ namespace Xceed.Wpf.AvalonDock.Layout
       }
 
       // When InitialContainer exists, set it to PreviousContainer in order to dock in expected position.
-      this.PreviousContainer = ( this.InitialContainer != null) ? this.InitialContainer : null;
+      this.PreviousContainer = ( this.InitialContainer != null ) ? this.InitialContainer : null;
       this.PreviousContainerIndex = ( this.InitialContainerIndex != -1 ) ? this.InitialContainerIndex : -1;
 
       this.InitialContainer = null;
@@ -751,15 +751,18 @@ namespace Xceed.Wpf.AvalonDock.Layout
         Hidden( this, EventArgs.Empty );
     }
 
-    internal void CloseAnchorable()
+    internal bool CloseAnchorable()
     {
-      if( this.TestCanClose() )
+      var canClose = this.TestCanClose();
+      if( canClose )
       {
         if( this.IsAutoHidden )
           this.ToggleAutoHide();
 
         this.CloseInternal();
       }
+
+      return canClose;
     }
 
     internal void SetCanCloseInternal( bool canClose )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs
index 880d2b5f..b4e0a41f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorableFloatingWindow.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,11 +17,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Windows.Markup;
-using System.Diagnostics;
-using System.Xml.Serialization;
 using System.Xml;
+using System.Xml.Serialization;
 
 namespace Xceed.Wpf.AvalonDock.Layout
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs
index ee0f44bc..99845472 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePane.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs
index d05ae91f..11c858a2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutAnchorablePaneGroup.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -95,11 +95,11 @@ namespace Xceed.Wpf.AvalonDock.Layout
 
     //protected override void OnChildrenCollectionChanged()
     //{
-      //if( DockWidth.IsAbsolute && ChildrenCount == 1 )
-      //  ( (ILayoutPositionableElement)Children[ 0 ] ).DockWidth = DockWidth;
-      //if( DockHeight.IsAbsolute && ChildrenCount == 1 )
-      //  ( ( ILayoutPositionableElement )Children[ 0 ] ).DockHeight = DockHeight;
-      //base.OnChildrenCollectionChanged();
+    //if( DockWidth.IsAbsolute && ChildrenCount == 1 )
+    //  ( (ILayoutPositionableElement)Children[ 0 ] ).DockWidth = DockWidth;
+    //if( DockHeight.IsAbsolute && ChildrenCount == 1 )
+    //  ( ( ILayoutPositionableElement )Children[ 0 ] ).DockHeight = DockHeight;
+    //base.OnChildrenCollectionChanged();
     //}
 
     public override void WriteXml( System.Xml.XmlWriter writer )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs
index 741abc98..6d13ad0e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutContent.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,14 +16,13 @@
   ***********************************************************************************/
 
 using System;
+using System.ComponentModel;
+using System.Globalization;
 using System.Linq;
-using System.Windows.Markup;
-using System.Xml.Serialization;
 using System.Windows;
-using System.Globalization;
+using System.Windows.Markup;
 using System.Windows.Media;
-using System.ComponentModel;
-using Xceed.Wpf.AvalonDock.Controls;
+using System.Xml.Serialization;
 
 namespace Xceed.Wpf.AvalonDock.Layout
 {
@@ -43,7 +42,7 @@ namespace Xceed.Wpf.AvalonDock.Layout
 
     #region Title
 
-    public static readonly DependencyProperty TitleProperty =  DependencyProperty.Register( "Title", typeof( string ), typeof( LayoutContent ), new UIPropertyMetadata( null, OnTitlePropertyChanged, CoerceTitleValue ) );
+    public static readonly DependencyProperty TitleProperty = DependencyProperty.Register( "Title", typeof( string ), typeof( LayoutContent ), new UIPropertyMetadata( null, OnTitlePropertyChanged, CoerceTitleValue ) );
 
     public string Title
     {
@@ -114,7 +113,7 @@ namespace Xceed.Wpf.AvalonDock.Layout
     {
       get
       {
-        return (string)GetValue( ContentIdProperty );
+        return ( string )GetValue( ContentIdProperty );
       }
       set
       {
@@ -127,7 +126,7 @@ namespace Xceed.Wpf.AvalonDock.Layout
       var layoutContent = obj as LayoutContent;
       if( layoutContent != null )
       {
-        layoutContent.OnContentIdPropertyChanged( (string)args.OldValue, (string)args.NewValue );
+        layoutContent.OnContentIdPropertyChanged( ( string )args.OldValue, ( string )args.NewValue );
       }
     }
 
@@ -897,9 +896,9 @@ namespace Xceed.Wpf.AvalonDock.Layout
 
       if( this is LayoutAnchorable )
       {
-        if( ( (LayoutAnchorable)this ).CanClose )
+        if( ( ( LayoutAnchorable )this ).CanClose )
         {
-          ( (LayoutAnchorable)this ).SetCanCloseInternal( true );
+          ( ( LayoutAnchorable )this ).SetCanCloseInternal( true );
         }
       }
 
@@ -958,13 +957,14 @@ namespace Xceed.Wpf.AvalonDock.Layout
 
         IsSelected = true;
         IsActive = true;
-        IsFloating = false;
       }
       else
       {
         InternalDock();
       }
 
+      IsFloating = false;
+
       if( this.Root != null )
       {
         Root.CollectGarbage();
@@ -1043,6 +1043,6 @@ namespace Xceed.Wpf.AvalonDock.Layout
     public event EventHandler<CancelEventArgs> Closing;
 
 
-#endregion
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs
index 63f2daed..cfebd727 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocument.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,7 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Globalization;
 using System.Linq;
 
 namespace Xceed.Wpf.AvalonDock.Layout
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs
index 82d51772..a2225d79 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentFloatingWindow.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,10 +17,10 @@
 
 using System;
 using System.Collections.Generic;
-using System.Windows.Markup;
 using System.Diagnostics;
-using System.Xml.Serialization;
+using System.Windows.Markup;
 using System.Xml;
+using System.Xml.Serialization;
 
 namespace Xceed.Wpf.AvalonDock.Layout
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs
index 90f85536..0bff878c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPane.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs
index 51ff4bcf..555075c3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutDocumentPaneGroup.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs
index 5fafdd47..05c061df 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElement.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,8 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 using System.ComponentModel;
+using System.Windows;
 using System.Xml.Serialization;
 
 namespace Xceed.Wpf.AvalonDock.Layout
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs
index b3d1cef8..80b52fb4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutElementEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs
index 2be7529c..86e3a38e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutFloatingWindow.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,9 +17,9 @@
 
 using System;
 using System.Collections.Generic;
-using System.Xml.Serialization;
-using System.Xml.Schema;
 using System.Xml;
+using System.Xml.Schema;
+using System.Xml.Serialization;
 
 namespace Xceed.Wpf.AvalonDock.Layout
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs
index ceeae097..5f44f004 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroup.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,8 +17,8 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Collections.ObjectModel;
+using System.Linq;
 using System.Xml.Serialization;
 
 namespace Xceed.Wpf.AvalonDock.Layout
@@ -149,7 +149,7 @@ namespace Xceed.Wpf.AvalonDock.Layout
 
     public void ReplaceChildAt( int index, ILayoutElement element )
     {
-      if( (index >= 0) && (index < _children.Count) )
+      if( ( index >= 0 ) && ( index < _children.Count ) )
       {
         _children[ index ] = ( T )element;
       }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs
index cc4156e6..65bce196 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutGroupBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs
index d6dba4d4..766f2edd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPanel.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,8 +17,8 @@
 
 using System;
 using System.Linq;
-using System.Windows.Markup;
 using System.Windows.Controls;
+using System.Windows.Markup;
 
 namespace Xceed.Wpf.AvalonDock.Layout
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs
index 609e8478..13d112bf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutPositionableGroup.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,8 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 using System.Globalization;
+using System.Windows;
 
 namespace Xceed.Wpf.AvalonDock.Layout
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs
index 1c3c7ff4..70449988 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/LayoutRoot.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,16 +17,13 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
 using System.Collections.ObjectModel;
+using System.Linq;
+using System.Windows.Controls;
 using System.Windows.Markup;
-using System.Xml.Serialization;
-using Standard;
 using System.Xml;
 using System.Xml.Schema;
-using System.Windows.Controls;
+using System.Xml.Serialization;
 
 namespace Xceed.Wpf.AvalonDock.Layout
 {
@@ -473,7 +470,7 @@ namespace Xceed.Wpf.AvalonDock.Layout
           }
 
           //...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 ) 
+          if( !this.Descendents().OfType<ILayoutPreviousContainer>().Any( c => c.PreviousContainer == emptyPane )
             && !this.Descendents().OfType<ILayoutInitialContainer>().Any( c => c.InitialContainer == emptyPane ) )
           {
             var parentGroup = emptyPane.Parent as ILayoutContainer;
@@ -940,7 +937,7 @@ namespace Xceed.Wpf.AvalonDock.Layout
 
       if( reader.LocalName.Equals( "RootPanel" ) )
       {
-        orientation = (reader.GetAttribute( "Orientation" ) == "Vertical") ? Orientation.Vertical : Orientation.Horizontal;
+        orientation = ( reader.GetAttribute( "Orientation" ) == "Vertical" ) ? Orientation.Vertical : Orientation.Horizontal;
         reader.Read();
 
         while( true )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs
index e3dcfc20..40233fe8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializationCallbackEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs
index da0f7b00..242de2a0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/LayoutSerializer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs
index da110fe4..0328dc18 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Layout/Serialization/XmlLayoutSerializer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,8 @@
 
   ***********************************************************************************/
 
-using System.Xml.Serialization;
 using System.IO;
+using System.Xml.Serialization;
 
 namespace Xceed.Wpf.AvalonDock.Layout.Serialization
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs
index 76693d1c..c0cc1b54 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/LayoutEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/MathHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/MathHelper.cs
index b63755a5..166747b0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/MathHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/MathHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs
index 369fb965..fddba0e8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -72,7 +72,11 @@ using System;
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
+#if NETCORE || NET5
+[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )]
+#else
 [assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
+#endif
 [assembly: AssemblyKeyName( "" )]
 #pragma warning restore 1699
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs
index 128084ee..2eea1533 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.Designer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.cs-CZ.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.cs-CZ.Designer.cs
index 6a519dc1..a0c04405 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.cs-CZ.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.cs-CZ.Designer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.Designer.cs
index 6a519dc1..a0c04405 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.de.Designer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.Designer.cs
index 6a519dc1..a0c04405 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.es.Designer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.Designer.cs
index 6a519dc1..a0c04405 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.fr.Designer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.Designer.cs
index 6a519dc1..a0c04405 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.hu.Designer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.Designer.cs
index 6a519dc1..a0c04405 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.it.Designer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ja-JP.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ja-JP.Designer.cs
index 6a519dc1..a0c04405 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ja-JP.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ja-JP.Designer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.Designer.cs
new file mode 100644
index 00000000..a0c04405
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.Designer.cs
@@ -0,0 +1,17 @@
+/*************************************************************************************
+   
+   Toolkit for WPF
+
+   Copyright (C) 2007-2022 Xceed Software Inc.
+
+   This program is provided to you under the terms of the XCEED SOFTWARE, INC.
+   COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
+   https://github.com/xceedsoftware/wpftoolkit/blob/master/license.md 
+
+   For more features, controls, and fast professional support,
+   pick up the Plus Edition at https://xceed.com/xceed-toolkit-plus-for-wpf/
+
+   Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
+
+  ***********************************************************************************/
+
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.resx b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.resx
new file mode 100644
index 00000000..76acb0b6
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.nl-BE.resx
@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="Anchorable_AutoHide" xml:space="preserve">
+    <value>Automatisch Verbergen</value>
+  </data>
+  <data name="Anchorable_BtnAutoHide_Hint" xml:space="preserve">
+    <value>Automatisch Verbergen</value>
+  </data>
+  <data name="Anchorable_BtnClose_Hint" xml:space="preserve">
+    <value>Verstop Alles</value>
+  </data>
+  <data name="Anchorable_CxMenu_Hint" xml:space="preserve">
+    <value>Venster Positie</value>
+  </data>
+  <data name="Anchorable_Dock" xml:space="preserve">
+    <value>Anker</value>
+  </data>
+  <data name="Anchorable_DockAsDocument" xml:space="preserve">
+    <value>Dock Als Documenttabblad</value>
+  </data>
+  <data name="Anchorable_Float" xml:space="preserve">
+    <value>Drijvend</value>
+  </data>
+  <data name="Anchorable_Hide" xml:space="preserve">
+    <value>Verstoppen</value>
+  </data>
+  <data name="Document_BtnPinned_Hint" xml:space="preserve">
+    <value>Ankeren / Losmaken</value>
+  </data>
+  <data name="Document_Close" xml:space="preserve">
+    <value>Sluiten</value>
+  </data>
+  <data name="Document_CloseAll" xml:space="preserve">
+    <value>Sluit Alles</value>
+  </data>
+  <data name="Document_CloseAllButThis" xml:space="preserve">
+    <value>Sluit Alles Behalve Dit</value>
+  </data>
+  <data name="Document_CxMenu_Hint" xml:space="preserve">
+    <value>Venster Positie</value>
+  </data>
+  <data name="Document_DockAsDocument" xml:space="preserve">
+    <value>Tabblad Dock Als Document</value>
+  </data>
+  <data name="Document_Float" xml:space="preserve">
+    <value>Drijvend</value>
+  </data>
+  <data name="Document_MoveToNextTabGroup" xml:space="preserve">
+    <value>Naar De Volgende Groep Tabbladen Gaan</value>
+  </data>
+  <data name="Document_MoveToPreviousTabGroup" xml:space="preserve">
+    <value>Verplaatsen Naar Vorige Tabbladgroep</value>
+  </data>
+  <data name="Document_NewHorizontalTabGroup" xml:space="preserve">
+    <value>Nieuwe Horizontale Tabbladgroep</value>
+  </data>
+  <data name="Document_NewVerticalTabGroup" xml:space="preserve">
+    <value>Nieuwe Verticale Tabbladgroep</value>
+  </data>
+  <data name="Window_Maximize" xml:space="preserve">
+    <value>Volledig Scherm</value>
+  </data>
+  <data name="Window_Restore" xml:space="preserve">
+    <value>Herstellen</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.Designer.cs
index 6a519dc1..a0c04405 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.pt-BR.Designer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.Designer.cs
index 6a519dc1..a0c04405 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ro.Designer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.Designer.cs
index 6a519dc1..a0c04405 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.ru.Designer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.Designer.cs
index 6a519dc1..a0c04405 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.sv.Designer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.Designer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.Designer.cs
index 6a519dc1..a0c04405 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.Designer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Properties/Resources.zh-Hans.Designer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Default.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Default.xaml
index 313c181f..8de02e25 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Default.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Default.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -1249,14 +1249,8 @@
             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="WindowStyle"
+            Value="None" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type avalonDockControls:NavigatorWindow}">
@@ -1311,7 +1305,7 @@
                       <RowDefinition Height="Auto" />
                       <RowDefinition />
                     </Grid.RowDefinitions>
-                    <TextBlock Text="Active Tool Windows"
+                    <TextBlock Text="{Binding LayoutAnchorablesLabel, Mode=TwoWay}"
                                FontWeight="Bold"
                                Margin="0,3,0,4">
                     </TextBlock>
@@ -1364,7 +1358,7 @@
                       <RowDefinition Height="Auto" />
                       <RowDefinition />
                     </Grid.RowDefinitions>
-                    <TextBlock Text="Active Files"
+                    <TextBlock Text="{Binding LayoutDocumentsLabel, Mode=TwoWay}"
                                FontWeight="Bold"
                                Margin="0,3,0,4">
                     </TextBlock>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs
index c02a357a..474b767d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/DictionaryTheme.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs
index af2a9e84..c251c40d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/GenericTheme.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -24,7 +24,13 @@ namespace Xceed.Wpf.AvalonDock.Themes
     public override Uri GetResourceUri()
     {
       string uri;
+#if NETCORE
+          uri = "Xceed.Wpf.AvalonDock.NETCore";
+#elif NET5
+          uri = "Xceed.Wpf.AvalonDock.NET5";
+#else
       uri = "Xceed.Wpf.AvalonDock";
+#endif
 
       return new Uri( "/" + uri + ";component/Themes/generic.xaml", UriKind.Relative );
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Theme.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Theme.cs
index 12fce8ab..4ee5d940 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Theme.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/Theme.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml
index 7804e2af..f5b89945 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Themes/generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs
index 93389b9b..e5f695cb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Win32Helper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/WindowHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/WindowHelper.cs
index 90c4958b..6705fe97 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/WindowHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/WindowHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,9 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows.Media;
 using System.Windows;
 using System.Windows.Interop;
+using System.Windows.Media;
 
 namespace Xceed.Wpf.AvalonDock
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.NET5.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.NET5.csproj
new file mode 100644
index 00000000..49de2dcc
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.NET5.csproj
@@ -0,0 +1,365 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>obj\net5\</BaseIntermediateOutputPath>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <RootNamespace>Xceed.Wpf.AvalonDock</RootNamespace>
+    <AssemblyName>Xceed.Wpf.AvalonDock.NET5</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NET5</DefineConstants>
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;NET5</DefineConstants>
+    <DebugType>none</DebugType>
+    <DebugSymbols>False</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfo.cs">
+      <Link>AssemblyVersionInfo.cs</Link>
+    </Compile>
+    <Compile Include="..\Xceed.Wpf.Toolkit\AssemblyVersionInfoCommon.cs">
+      <Link>AssemblyVersionInfoCommon.cs</Link>
+    </Compile>
+    <Compile Include="Commands\RelayCommand.cs" />
+    <Compile Include="Controls\AnchorablePaneControlOverlayArea.cs" />
+    <Compile Include="Controls\AnchorablePaneDropTarget.cs" />
+    <Compile Include="Controls\AnchorablePaneTabPanel.cs" />
+    <Compile Include="Controls\AnchorablePaneTitle.cs" />
+    <Compile Include="Controls\AutoHideWindowManager.cs" />
+    <Compile Include="Controls\BindingHelper.cs" />
+    <Compile Include="Controls\ContextMenuEx.cs" />
+    <Compile Include="Controls\FullWeakDictionary.cs" />
+    <Compile Include="Controls\DocumentPaneDropAsAnchorableTarget.cs" />
+    <Compile Include="Controls\DocumentPaneGroupDropTarget.cs" />
+    <Compile Include="Controls\DropDownButton.cs" />
+    <Compile Include="Controls\DropDownControlArea.cs" />
+    <Compile Include="Controls\DropTargetBase.cs" />
+    <Compile Include="Controls\LayoutCachePaneControl.cs" />
+    <Compile Include="Controls\WeakDictionary.cs" />
+    <Compile Include="Controls\WindowActivateEventArgs.cs" />
+    <Compile Include="Controls\WindowHookHandler.cs" />
+    <Compile Include="Controls\FocusElementManager.cs" />
+    <Compile Include="Controls\LayoutAnchorableItem.cs" />
+    <Compile Include="Controls\LayoutDocumentItem.cs" />
+    <Compile Include="Controls\LayoutItem.cs" />
+    <Compile Include="Controls\MenuItemEx.cs" />
+    <Compile Include="Controls\NavigatorWindow.cs" />
+    <Compile Include="Controls\ReentrantFlag.cs" />
+    <Compile Include="Controls\Shell\Standard\ComGuids.cs" />
+    <Compile Include="Controls\Shell\Standard\Debug.cs" />
+    <Compile Include="Controls\Shell\Standard\DoubleUtil.cs" />
+    <Compile Include="Controls\Shell\Standard\DpiHelper.cs" />
+    <Compile Include="Controls\Shell\Standard\ErrorCodes.cs" />
+    <Compile Include="Controls\Shell\Standard\MessageWindow.cs" />
+    <Compile Include="Controls\Shell\Standard\NativeMethods.cs" />
+    <Compile Include="Controls\Shell\Standard\ShellProvider.cs" />
+    <Compile Include="Controls\Shell\Standard\StreamHelper.cs" />
+    <Compile Include="Controls\Shell\Standard\Utilities.cs" />
+    <Compile Include="Controls\Shell\Standard\Verify.cs" />
+    <Compile Include="Controls\Shell\SystemCommands.cs" />
+    <Compile Include="Controls\Shell\SystemParameters2.cs" />
+    <Compile Include="Controls\Shell\WindowChrome.cs" />
+    <Compile Include="Controls\Shell\WindowChromeWorker.cs" />
+    <Compile Include="Converters\ActivateCommandLayoutItemFromLayoutModelConverter.cs" />
+    <Compile Include="Converters\AnchorableContextMenuAutoHideHeaderConverter.cs" />
+    <Compile Include="Converters\AnchorableContextMenuHideVisibilityConverter.cs" />
+    <Compile Include="Converters\AutoHideCommandLayoutItemFromLayoutModelConverter.cs" />
+    <Compile Include="Converters\HideCommandLayoutItemFromLayoutModelConverter.cs" />
+    <Compile Include="Converters\InverseBoolToVisibilityConverter.cs" />
+    <Compile Include="Converters\LayoutItemFromLayoutModelConverter.cs" />
+    <Compile Include="Converters\NullToDoNothingConverter.cs" />
+    <Compile Include="Converters\UriSourceToBitmapImageConverter.cs" />
+    <Compile Include="DocumentClosedEventArgs.cs" />
+    <Compile Include="DocumentClosingEventArgs.cs" />
+    <Compile Include="Extentions.cs" />
+    <Compile Include="LayoutEventArgs.cs" />
+    <Compile Include="Layout\AnchorableShowStrategy.cs" />
+    <Compile Include="Layout\AnchorSide.cs" />
+    <Compile Include="Controls\DockingManagerDropTarget.cs" />
+    <Compile Include="Controls\DockingManagerOverlayArea.cs" />
+    <Compile Include="Controls\DocumentPaneControlOverlayArea.cs" />
+    <Compile Include="Controls\DocumentPaneDropTarget.cs" />
+    <Compile Include="Controls\DocumentPaneTabPanel.cs" />
+    <Compile Include="Controls\DragService.cs" />
+    <Compile Include="Controls\DropArea.cs" />
+    <Compile Include="Controls\DropTarget.cs" />
+    <Compile Include="Controls\DropTargetType.cs" />
+    <Compile Include="Controls\Extentions.cs" />
+    <Compile Include="Controls\IDropTarget.cs" />
+    <Compile Include="Controls\LayoutAnchorableControl.cs" />
+    <Compile Include="Controls\LayoutAnchorableFloatingWindowControl.cs" />
+    <Compile Include="Controls\LayoutAnchorablePaneControl.cs" />
+    <Compile Include="Controls\LayoutAnchorablePaneGroupControl.cs" />
+    <Compile Include="Controls\LayoutAnchorableTabItem.cs" />
+    <Compile Include="Controls\LayoutAnchorControl.cs" />
+    <Compile Include="Controls\LayoutAnchorGroupControl.cs" />
+    <Compile Include="Controls\LayoutAnchorSideControl.cs" />
+    <Compile Include="Controls\LayoutDocumentControl.cs" />
+    <Compile Include="Controls\LayoutDocumentFloatingWindowControl.cs" />
+    <Compile Include="Controls\LayoutDocumentPaneControl.cs" />
+    <Compile Include="Controls\LayoutDocumentPaneGroupControl.cs" />
+    <Compile Include="Controls\LayoutDocumentTabItem.cs" />
+    <Compile Include="Controls\LayoutFloatingWindowControl.cs" />
+    <Compile Include="Controls\LayoutGridControl.cs" />
+    <Compile Include="Controls\LayoutGridResizerControl.cs" />
+    <Compile Include="Controls\LayoutPanelControl.cs" />
+    <Compile Include="Controls\OverlayArea.cs" />
+    <Compile Include="Controls\OverlayWindow.cs" />
+    <Compile Include="Controls\OverlayWindowDropTarget.cs" />
+    <Compile Include="Controls\OverlayWindowDropTargetType.cs" />
+    <Compile Include="Controls\TransformExtentions.cs" />
+    <Compile Include="Converters\AnchorSideToAngleConverter.cs" />
+    <Compile Include="Converters\AnchorSideToOrientationConverter.cs" />
+    <Compile Include="Converters\BoolToVisibilityConverter.cs" />
+    <Compile Include="DockingManager.cs" />
+    <Compile Include="Layout\ChildrenTreeChangedEventArgs.cs" />
+    <Compile Include="Layout\Extentions.cs" />
+    <Compile Include="Layout\ILayoutAnchorablePane.cs" />
+    <Compile Include="Layout\ILayoutContainer.cs" />
+    <Compile Include="Layout\ILayoutContentSelector.cs" />
+    <Compile Include="Layout\ILayoutControl.cs" />
+    <Compile Include="Layout\ILayoutDocumentPane.cs" />
+    <Compile Include="Layout\ILayoutElement.cs" />
+    <Compile Include="Layout\ILayoutElementWithVisibility.cs" />
+    <Compile Include="Layout\ILayoutGroup.cs" />
+    <Compile Include="Layout\ILayoutInitialContainer.cs" />
+    <Compile Include="Layout\ILayoutOrientableElement.cs" />
+    <Compile Include="Layout\ILayoutPane.cs" />
+    <Compile Include="Layout\ILayoutPanelElement.cs" />
+    <Compile Include="Layout\ILayoutPaneSerializable.cs" />
+    <Compile Include="Layout\ILayoutPositionableElement.cs" />
+    <Compile Include="Layout\ILayoutPreviousContainer.cs" />
+    <Compile Include="Layout\ILayoutRoot.cs" />
+    <Compile Include="Controls\IOverlayWindow.cs" />
+    <Compile Include="Controls\IOverlayWindowArea.cs" />
+    <Compile Include="Controls\IOverlayWindowDropTarget.cs" />
+    <Compile Include="Controls\IOverlayWindowHost.cs" />
+    <Compile Include="Layout\ILayoutUpdateStrategy.cs" />
+    <Compile Include="Layout\LayoutAnchorable.cs" />
+    <Compile Include="Layout\LayoutAnchorableFloatingWindow.cs" />
+    <Compile Include="Layout\LayoutAnchorablePane.cs" />
+    <Compile Include="Layout\LayoutAnchorablePaneGroup.cs" />
+    <Compile Include="Layout\LayoutAnchorGroup.cs" />
+    <Compile Include="Layout\LayoutAnchorSide.cs" />
+    <Compile Include="Controls\LayoutAutoHideWindowControl.cs" />
+    <Compile Include="Layout\LayoutContent.cs" />
+    <Compile Include="Layout\LayoutDocument.cs" />
+    <Compile Include="Layout\LayoutDocumentFloatingWindow.cs" />
+    <Compile Include="Layout\LayoutDocumentPane.cs" />
+    <Compile Include="Layout\LayoutDocumentPaneGroup.cs" />
+    <Compile Include="Layout\LayoutElement.cs" />
+    <Compile Include="Layout\LayoutElementEventArgs.cs" />
+    <Compile Include="Layout\LayoutFloatingWindow.cs" />
+    <Compile Include="Layout\LayoutGroup.cs" />
+    <Compile Include="Layout\LayoutGroupBase.cs" />
+    <Compile Include="Layout\LayoutPanel.cs" />
+    <Compile Include="Layout\LayoutPositionableGroup.cs" />
+    <Compile Include="Layout\LayoutRoot.cs" />
+    <Compile Include="Layout\Serialization\LayoutSerializationCallbackEventArgs.cs" />
+    <Compile Include="Layout\Serialization\LayoutSerializer.cs" />
+    <Compile Include="Layout\Serialization\XmlLayoutSerializer.cs" />
+    <Compile Include="MathHelper.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.ja-JP.Designer.cs">
+      <DependentUpon>Resources.ja-JP.resx</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="Properties\Resources.cs-CZ.Designer.cs">
+      <DependentUpon>Resources.cs-CZ.resx</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="Properties\Resources.de.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.de.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.es.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.es.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.fr.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.fr.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.hu.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.hu.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.it.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.it.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.pt-BR.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.pt-BR.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.ro.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.ro.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.ru.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.ru.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.sv.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.sv.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Resources.zh-Hans.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.zh-Hans.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Themes\DictionaryTheme.cs" />
+    <Compile Include="Themes\GenericTheme.cs" />
+    <Compile Include="Themes\Theme.cs" />
+    <Compile Include="..\Xceed.Wpf.Toolkit\Utils\Exceptions\ThrowException.cs">
+      <Link>Utils\Exceptions\ThrowException.cs</Link>
+    </Compile>
+    <Compile Include="Win32Helper.cs" />
+    <Compile Include="WindowHelper.cs" />
+    <EmbeddedResource Include="Properties\Resources.ja-JP.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.ja-JP.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.cs-CZ.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.cs-CZ.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.hu.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.hu.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.it.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.it.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.fr.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.fr.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.es.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.es.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.pt-BR.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.pt-BR.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.ru.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.ru.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.de.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.de.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.sv.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.sv.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.zh-Hans.resx">
+      <SubType>Designer</SubType>
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.zh-Hans.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.ro.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.ro.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <AppDesigner Include="Properties\" />
+    <Resource Include="Themes\Generic\Images\DockBottom.PNG" />
+    <Resource Include="Themes\Generic\Images\DockLeft.PNG" />
+    <Resource Include="Themes\Generic\Images\DockPane.PNG" />
+    <Resource Include="Themes\Generic\Images\DockPaneEmpty.png" />
+    <Resource Include="Themes\Generic\Images\DockRight.PNG" />
+    <Resource Include="Themes\Generic\Images\DockTop.PNG" />
+    <Resource Include="Themes\Generic\Images\HTabGroup.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockDocPaneBottom.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockDocPaneLeft.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockDocPaneRight.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockDocPaneTop.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockPaneBottom.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockPaneInside.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockPaneLeft.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockPaneRight.png" />
+    <Resource Include="Themes\Generic\Images\InnerDockPaneTop.png" />
+    <Resource Include="Themes\Generic\Images\Locked.png" />
+    <Resource Include="Themes\Generic\Images\PinAutoHide.png" />
+    <Resource Include="Themes\Generic\Images\PinClose.png" />
+    <Resource Include="Themes\Generic\Images\PinDocMenu.png" />
+    <Resource Include="Themes\Generic\Images\PinMenu.png" />
+    <Resource Include="Themes\Generic\Images\VTabGroup.png" />
+    <Resource Include="Themes\Generic\Images\PinMaximize.png" />
+    <Resource Include="Themes\Generic\Images\PinRestore.png" />
+    <Page Include="Themes\Default.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.NET5.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\PinAutoHide_White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\PinClose_White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\PinDocMenu_White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\PinMenu_White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\PinMaximize_White.png" />
+    <Resource Include="Themes\Generic\Images\PinRestore_White.png" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
index ff574bf8..ad90d332 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.AvalonDock/Xceed.Wpf.AvalonDock.csproj
@@ -246,6 +246,11 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.it.resx</DependentUpon>
     </Compile>
+    <Compile Include="Properties\Resources.nl-BE.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.nl-BE.resx</DependentUpon>
+    </Compile>
     <Compile Include="Properties\Resources.pt-BR.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -294,6 +299,10 @@
       <LastGenOutput>Resources.hu.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.nl-BE.resx">
+      <Generator>PublicResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.nl-BE.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml
index 1ff8b9cc..6790bc50 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/App.xaml.cs
index b01a8562..19fbc3a6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
 using System.Windows;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeBox.cs
index 572e5fca..25595c99 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -20,7 +20,6 @@ using System.IO;
 using System.Windows;
 using System.Windows.Media;
 using System.Windows.Resources;
-using Xceed.Wpf.Toolkit.LiveExplorer.Core;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer
 {
@@ -62,11 +61,17 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer
 
   public class XamlBox : CodeBox
   {
-    public XamlBox() { this.TextFormatter = new Core.XamlFormatter(); }
+    public XamlBox()
+    {
+      this.TextFormatter = new Core.XamlFormatter();
+    }
   }
 
   public class CSharpBox : CodeBox
   {
-    public CSharpBox() { this.TextFormatter = new Core.CSharpFormatter(); }
+    public CSharpBox()
+    {
+      this.TextFormatter = new Core.CSharpFormatter();
+    }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AutoSelectTextboxView.xaml.cs.txt
index 4e0aa0c4..3f81fddd 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 c544a40e..7443dd27 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.cs.txt
index 7c736fd7..8a10b2a0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.txt
index 862f5841..8dafee6d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockPropertiesView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.cs.txt
index ebe6e433..f248e64c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.txt
index 6b82d0ca..e6587e1e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/AvalonDockSourcesView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 da375176..da24fa46 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,9 @@
 
   ************************************************************************************/
 
+using System.IO;
 using System.Windows;
 using Xceed.Wpf.AvalonDock.Layout.Serialization;
-using System.IO;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views
 {
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 62367e18..842d24a6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 47fa3623..87ad8f73 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 448f1203..a69553bf 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 62f53c89..e8dee1f0 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 4addac8f..f4ec69a6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 5c7f182a..92217edd 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -20,7 +20,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views
   /// <summary>
   /// Interaction logic for BusyIndicatorView.xaml
   /// </summary>
-  public partial class BusyIndicatorView: DemoView
+  public partial class BusyIndicatorView : DemoView
   {
     public BusyIndicatorView()
     {
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 cab14c13..a8360590 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 a6df3658..55aeee37 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,7 +17,6 @@
 
 using System;
 using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views
 {
@@ -33,7 +32,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views
 
     private void ButtonSpinner_Spin( object sender, SpinEventArgs e )
     {
-      String[] names = (String[])this.Resources[ "names" ];
+      String[] names = ( String[] )this.Resources[ "names" ];
 
       ButtonSpinner spinner = ( ButtonSpinner )sender;
       TextBox txtBox = ( TextBox )spinner.Content;
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 39df4389..5abd12e9 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 fd61804d..161fa923 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 a660323b..ec9bb212 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 a81861c4..79f0ad6f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,7 @@
 
   ************************************************************************************/
 
-using System.Windows.Media;
 using System.Windows.Controls;
-using System;
-using System.Diagnostics;
 using System.Windows;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
@@ -51,9 +48,12 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 
 
 
+
+
     #region Implementation
 
 
     #endregion
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ChartAxisView.xaml.txt
index 0c42b972..3d214909 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 6518b652..38ecbafa 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,6 @@
 
   **************************************************************************************/
 
-using System.Windows.Media;
-using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
   /// <summary>
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 55ae2f55..79dd07a2 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7c9bc0a8..6842dc01 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,9 +17,6 @@
 
 using System.Windows.Media;
 using System.Windows;
-using Xceed.Wpf.Toolkit.Panels;
-using System;
-using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
   /// <summary>
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 08308b98..aa2ce4ae 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 722cf830..fe170bad 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   ************************************************************************************/
 
-using System.Windows.Media;
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
   /// <summary>
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 5b20a789..ab366150 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 be607a63..e0ac38e1 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   ************************************************************************************/
 
-using System.Windows.Media;
-using System.Windows.Controls;
-using System;
-using System.Windows;
-using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
   /// <summary>
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 30fe5437..964875d5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 5811dd25..4131e26d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   *************************************************************************************/
 
-using System.Windows.Media;
-using System.Windows.Controls;
-using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
   /// <summary>
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 680a88cb..5f3ec26a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 d40e2135..921fb3b4 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,8 @@
 
   *************************************************************************************/
 
-using System.Windows.Media;
-using System.Windows.Controls;
 using System.Windows;
 using System;
-using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
   /// <summary>
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 34842933..bb74e164 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e11f8332..cc1d309e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,12 +15,6 @@
 
   *************************************************************************************/
 
-using System.Windows.Media;
-using System.Windows.Controls;
-using System;
-using System.Windows.Media.Imaging;
-using System.Windows;
-using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
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 028908dd..3839e1a8 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7536f13c..63243955 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,7 +16,6 @@
   *************************************************************************************/
 
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views
@@ -108,7 +107,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views
     {
       get
       {
-        string completeName = string.Format("{0} {1}", FirstName, LastName).PadRight(20);
+        string completeName = string.Format( "{0} {1}", FirstName, LastName ).PadRight( 20 );
         return string.Format(
           "ID={0}: Name= {1}, IsSelected= {2}",
           ID,
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 418688e2..035c0de1 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 004d3caf..248baf3f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,6 @@
 
   *************************************************************************************/
 
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using System.Diagnostics;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 {
   /// <summary>
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 e49be00e..4edb90b7 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 105a0b6c..e2f915a8 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,6 @@
 
   ***********************************************************************************/
 
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Color.Views
 {
   /// <summary>
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 f1bbf7ee..793d6e3f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 11e34778..ea8736f6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 838c9782..4fbdb11d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 1bf2ddfe..dd0df044 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -24,7 +24,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Views
   {
     public DateTimeView()
     {
-      InitializeComponent(); 
+      InitializeComponent();
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/DateTimeView.xaml.txt
index 0db5e030..eb8dc98a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,191 +16,433 @@
   ***********************************************************************************-->
 
 <local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Views.DateTimeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters"
-                 Title="DateTime">
-    <local:DemoView.Description>
-        <Paragraph FontSize="14" FontFamily="Segoe">
-            The DateTimePicker and TimePicker controls let you select the date and the time in several ways. The TimePicker is used in the DateTimePicker.
-        </Paragraph>
-    </local:DemoView.Description>
-
-    <local:DemoView.Resources>
-      <conv:DateTimeToTimeSpanConverter x:Key="dateTimeToTimeSpanConverter" />
-      <conv:CustomFormatToBoolConverter x:Key="CustomFormatToBoolConverter" />
-
-      <ObjectDataProvider x:Key="enumDateFormatData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:DateTimeFormat"/>
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        <ObjectDataProvider x:Key="enumVisibility" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="Visibility" />
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-       <ObjectDataProvider x:Key="enumKind" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="sys:DateTimeKind" />
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-      <ObjectDataProvider x:Key="enumCalendarDisplayMode"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="CalendarMode" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-      <ObjectDataProvider x:Key="enumDateTimePart" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:DateTimePart"/>
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-   </local:DemoView.Resources>
-    <Grid>
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters"
+                Title="DateTime">
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      The DateTimePicker and TimePicker controls let you select the date and the time in several ways. The TimePicker is used in the DateTimePicker.
+    </Paragraph>
+  </local:DemoView.Description>
+
+  <local:DemoView.Resources>
+    <conv:DateTimeToTimeSpanConverter x:Key="dateTimeToTimeSpanConverter" />
+    <conv:CustomFormatToBoolConverter x:Key="CustomFormatToBoolConverter" />
+
+    <ObjectDataProvider x:Key="enumDateFormatData"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="xctk:DateTimeFormat" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+    <ObjectDataProvider x:Key="enumVisibility"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="Visibility" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+    <ObjectDataProvider x:Key="enumKind"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="sys:DateTimeKind" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+    <ObjectDataProvider x:Key="enumCalendarDisplayMode"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="CalendarMode" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+    <ObjectDataProvider x:Key="enumDateTimePart"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="xctk:DateTimePart" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+  </local:DemoView.Resources>
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+    </Grid.RowDefinitions>
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="*" />
+      <ColumnDefinition Width="*" />
+    </Grid.ColumnDefinitions>
+
+    <GroupBox Header="Features"
+              Grid.ColumnSpan="2"
+              HorizontalAlignment="Stretch">
+      <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="*"/>
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
-      <GroupBox Header="Features" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" >
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="Format:" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" />
-            <ComboBox x:Name="_format" Grid.Row="0" Grid.Column="1" SelectedIndex="1" ItemsSource="{Binding Source={StaticResource enumDateFormatData}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="FormatString:" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_formatString}" Style="{StaticResource DisableGrayText}" />
-            <TextBox x:Name="_formatString" Grid.Row="1" Grid.Column="1" Text="yy MMM dd" Width="190" IsEnabled="{Binding Source={x:Reference _format}, Path=SelectedItem, Converter={StaticResource CustomFormatToBoolConverter}}" Margin="5,5,25,5"/>
-            <TextBlock Text="Watermark:" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center"/>
-            <TextBox x:Name="_watermark" Grid.Row="2" Grid.Column="1" Text="Enter Text" Width="190" VerticalAlignment="Center" Margin="5,5,25,5"/>  
-            <TextBlock Text="AutoCloseCalendar:" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_autoCloseCalendar" Grid.Row="3" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5,5,25,5"/>    
-            <TextBlock Text="ClipValueToMinMax:" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_clipValueToMinMax" Grid.Row="4" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5,5,25,5"/>
-            <TextBlock Text="Kind:" Grid.Row="5" Grid.Column="0" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_kind" Grid.Row="5" Grid.Column="1" SelectedIndex="2" ItemsSource="{Binding Source={StaticResource enumKind}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="CalendarDisplayMode:" Grid.Row="6" Grid.Column="0" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_calendarDisplayMode" Grid.Row="6" Grid.Column="1" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumCalendarDisplayMode}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="CalendarWidth:" Grid.Row="7" Grid.Column="0" VerticalAlignment="Center"/>
-            <xctk:DoubleUpDown x:Name="_calendarWidth" Grid.Row="7" Grid.Column="1" Value="178" Minimum="100" Maximum="500" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="ShowDropDownButton:" Grid.Row="8" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_showDropDownButton" Grid.Row="8" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5,5,25,5"/>
-            <TextBlock Text="TimePickerVisibility:" Grid.Row="9" Grid.Column="0" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_timePickerVisibility" Grid.Row="9" Grid.Column="1" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumVisibility}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="TimePickerShowButtonSpinner:" Grid.Row="10" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_timePickerShowButtonSpinner" Grid.Row="10" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5,5,25,5"/>
-
-            <TextBlock Text="TimeFormat:" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
-            <ComboBox x:Name="_timeFormat" Grid.Row="0" Grid.Column="3" SelectedIndex="7" ItemsSource="{Binding Source={StaticResource enumDateFormatData}}" Width="190" Margin="5"/>
-            <TextBlock Text="Time FormatString:" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_timeFormatString}" Style="{StaticResource DisableGrayText}"/>
-            <TextBox x:Name="_timeFormatString" Grid.Row="1" Grid.Column="3" Text="H:mm" Width="190"  IsEnabled="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem, Converter={StaticResource CustomFormatToBoolConverter}}" Margin="5"/>            
-            <TextBlock Text="TimeWatermark:" Grid.Row="2" Grid.Column="2" VerticalAlignment="Center"/>
-            <TextBox x:Name="_timeWatermark" Grid.Row="2" Grid.Column="3" Text="Enter Text" Width="190" VerticalAlignment="Center" Margin="5"/>
-            <TextBlock Text="Minimum:" Grid.Row="3" Grid.Column="2" VerticalAlignment="Center"/>
-            <xctk:DateTimeUpDown x:Name="_minimum" Grid.Row="3" Grid.Column="3" Format="Custom" FormatString="yyyy/MM/dd HH:mm" Value="2016/01/01T12:00" Width="190" VerticalAlignment="Center" Margin="5"/>
-            <TextBlock Text="Maximum:" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center"/>
-            <xctk:DateTimeUpDown x:Name="_maximum" Grid.Row="4" Grid.Column="3" Format="Custom" FormatString="yyyy/MM/dd HH:mm" Value="2022/12/31T12:00" Width="190" VerticalAlignment="Center" Margin="5"/>
-            <TextBlock Text="CurrentDateTimePart:" Grid.Row="5" Grid.Column="2" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_currentDateTimePart" Grid.Row="5" Grid.Column="3" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumDateTimePart}}" Width="190" Margin="5" ToolTip="Must match a DateTimePart of the DateTimePicker Format."/>
-            <TextBlock Text="Auto Clip time Parts:" Grid.Row="6" Grid.Column="2" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_autoClipTimeParts" Grid.Row="6" Grid.Column="3" IsChecked="False" VerticalAlignment="Center" Margin="5,5,25,5"/>
-         </Grid>
+        <TextBlock Text="Format:"
+                   Grid.Row="0"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_format"
+                  Grid.Row="0"
+                  Grid.Column="1"
+                  SelectedIndex="1"
+                  ItemsSource="{Binding Source={StaticResource enumDateFormatData}}"
+                  Width="185"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="FormatString:"
+                   Grid.Row="1"
+                   Grid.Column="0"
+                   VerticalAlignment="Center"
+                   IsEnabled="{Binding IsEnabled, ElementName=_formatString}"
+                   Style="{StaticResource DisableGrayText}" />
+        <TextBox x:Name="_formatString"
+                 Grid.Row="1"
+                 Grid.Column="1"
+                 Text="yy MMM dd"
+                 Width="185"
+                 IsEnabled="{Binding Source={x:Reference _format}, Path=SelectedItem, Converter={StaticResource CustomFormatToBoolConverter}}"
+                 Margin="5,5,25,5" />
+        <TextBlock Text="Watermark:"
+                   Grid.Row="2"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <TextBox x:Name="_watermark"
+                 Grid.Row="2"
+                 Grid.Column="1"
+                 Text="Enter Text"
+                 Width="185"
+                 VerticalAlignment="Center"
+                 Margin="5,5,25,5" />
+        <TextBlock Text="AutoCloseCalendar:"
+                   Grid.Row="3"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_autoCloseCalendar"
+                  Grid.Row="3"
+                  Grid.Column="1"
+                  IsChecked="False"
+                  VerticalAlignment="Center"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="AutoCloseCalendarOnTimeSelection:"
+                   Grid.Row="4"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_autoCloseCalendarOnTimeSelection"
+                  Grid.Row="4"
+                  Grid.Column="1"
+                  IsChecked="False"
+                  VerticalAlignment="Center"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="ClipValueToMinMax:"
+                   Grid.Row="5"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_clipValueToMinMax"
+                  Grid.Row="5"
+                  Grid.Column="1"
+                  IsChecked="False"
+                  VerticalAlignment="Center"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="CalendarDisplayMode:"
+                   Grid.Row="6"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_calendarDisplayMode"
+                  Grid.Row="6"
+                  Grid.Column="1"
+                  SelectedIndex="0"
+                  ItemsSource="{Binding Source={StaticResource enumCalendarDisplayMode}}"
+                  Width="185"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="ShowDropDownButton:"
+                   Grid.Row="7"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_showDropDownButton"
+                  Grid.Row="7"
+                  Grid.Column="1"
+                  IsChecked="True"
+                  VerticalAlignment="Center"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="TimePickerVisibility:"
+                   Grid.Row="8"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_timePickerVisibility"
+                  Grid.Row="8"
+                  Grid.Column="1"
+                  SelectedIndex="0"
+                  ItemsSource="{Binding Source={StaticResource enumVisibility}}"
+                  Width="185"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="TimePickerShowButtonSpinner:"
+                   Grid.Row="9"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_timePickerShowButtonSpinner"
+                  Grid.Row="9"
+                  Grid.Column="1"
+                  IsChecked="True"
+                  VerticalAlignment="Center"
+                  Margin="5" />
+        <TextBlock Text="TodayButtonVisibility:"
+                   Grid.Row="10"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_todayButtonVisibility"
+                  Grid.Row="10"
+                  Grid.Column="1"
+                  SelectedIndex="0"
+                  ItemsSource="{Binding Source={StaticResource enumVisibility}}"
+                  Width="185"
+                  Margin="5,5,25,5" />
+
+
+        <TextBlock Text="TimeFormat:"
+                   Grid.Row="0"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_timeFormat"
+                  Grid.Row="0"
+                  Grid.Column="3"
+                  SelectedIndex="7"
+                  ItemsSource="{Binding Source={StaticResource enumDateFormatData}}"
+                  Width="185"
+                  Margin="5" />
+        <TextBlock Text="Time FormatString:"
+                   Grid.Row="1"
+                   Grid.Column="2"
+                   VerticalAlignment="Center"
+                   IsEnabled="{Binding IsEnabled, ElementName=_timeFormatString}"
+                   Style="{StaticResource DisableGrayText}" />
+        <TextBox x:Name="_timeFormatString"
+                 Grid.Row="1"
+                 Grid.Column="3"
+                 Text="H:mm"
+                 Width="185"
+                 IsEnabled="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem, Converter={StaticResource CustomFormatToBoolConverter}}"
+                 Margin="5" />
+        <TextBlock Text="TimeWatermark:"
+                   Grid.Row="2"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <TextBox x:Name="_timeWatermark"
+                 Grid.Row="2"
+                 Grid.Column="3"
+                 Text="Enter Text"
+                 Width="185"
+                 VerticalAlignment="Center"
+                 Margin="5" />
+        <TextBlock Text="Minimum:"
+                   Grid.Row="3"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <xctk:DateTimeUpDown x:Name="_minimum"
+                             Grid.Row="3"
+                             Grid.Column="3"
+                             Format="Custom"
+                             FormatString="yyyy/MM/dd HH:mm"
+                             Value="2016/01/01T12:00"
+                             Width="185"
+                             VerticalAlignment="Center"
+                             Margin="5" />
+        <TextBlock Text="Maximum:"
+                   Grid.Row="4"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <xctk:DateTimeUpDown x:Name="_maximum"
+                             Grid.Row="4"
+                             Grid.Column="3"
+                             Format="Custom"
+                             FormatString="yyyy/MM/dd HH:mm"
+                             Value="2022/12/31T12:00"
+                             Width="185"
+                             VerticalAlignment="Center"
+                             Margin="5" />
+        <TextBlock Text="CurrentDateTimePart:"
+                   Grid.Row="5"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_currentDateTimePart"
+                  Grid.Row="5"
+                  Grid.Column="3"
+                  SelectedIndex="0"
+                  ItemsSource="{Binding Source={StaticResource enumDateTimePart}}"
+                  Width="185"
+                  Margin="5"
+                  ToolTip="Must match a DateTimePart of the DateTimePicker Format." />
+        <TextBlock Text="Auto Clip time Parts:"
+                   Grid.Row="6"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_autoClipTimeParts"
+                  Grid.Row="6"
+                  Grid.Column="3"
+                  IsChecked="False"
+                  VerticalAlignment="Center"
+                  Margin="5" />
+        <TextBlock Text="Kind:"
+                   Grid.Row="7"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_kind"
+                  Grid.Row="7"
+                  Grid.Column="3"
+                  SelectedIndex="2"
+                  ItemsSource="{Binding Source={StaticResource enumKind}}"
+                  Width="185"
+                  Margin="5" />
+        <TextBlock Text="CalendarWidth:"
+                   Grid.Row="8"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <xctk:DoubleUpDown x:Name="_calendarWidth"
+                           Grid.Row="8"
+                           Grid.Column="3"
+                           Value="178"
+                           Minimum="100"
+                           Maximum="500"
+                           Width="185"
+                           Margin="5" />
+      </Grid>
+    </GroupBox>
+
+    <StackPanel Grid.Row="1"
+                Grid.Column="0"
+                HorizontalAlignment="Left">
+      <TextBlock Text="DateTimePicker Usage: "
+                 Margin="0,10,0,0"
+                 Style="{StaticResource Header}" />
+      <xctk:DateTimePicker x:Name="_datetimePicker"
+                           Width="300"
+                           VerticalAlignment="Top"
+                           IsReadOnly="False"
+                           Format="{Binding Source={x:Reference _format}, Path=SelectedItem}"
+                           FormatString="{Binding Text, ElementName=_formatString}"
+                           Watermark="{Binding  Source={x:Reference _watermark}, Path=Text}"
+                           TimeFormat="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
+                           TimeFormatString="{Binding Text, ElementName=_timeFormatString}"
+                           TimeWatermark="{Binding  Source={x:Reference _timeWatermark}, Path=Text}"
+                           AutoCloseCalendar="{Binding IsChecked, ElementName=_autoCloseCalendar}"
+                           ClipValueToMinMax="{Binding IsChecked, ElementName=_clipValueToMinMax}"
+                           TimePickerVisibility="{Binding Source={x:Reference _timePickerVisibility}, Path=SelectedItem}"
+                           TimePickerShowButtonSpinner="{Binding IsChecked, ElementName=_timePickerShowButtonSpinner}"
+                           Minimum="{Binding Value, ElementName=_minimum}"
+                           Maximum="{Binding Value, ElementName=_maximum}"
+                           Kind="{Binding SelectedItem, ElementName=_kind}"
+                           CalendarDisplayMode="{Binding SelectedItem, ElementName=_calendarDisplayMode}"
+                           CalendarWidth="{Binding Value, ElementName=_calendarWidth}"
+                           ShowDropDownButton="{Binding IsChecked, ElementName=_showDropDownButton}"
+                           CurrentDateTimePart="{Binding SelectedItem, ElementName=_currentDateTimePart, Mode=TwoWay}"
+                           AutoClipTimeParts="{Binding IsChecked, ElementName=_autoClipTimeParts}" />
+    </StackPanel>
+
+    <StackPanel Grid.Row="1"
+                Grid.Column="1"
+                HorizontalAlignment="Stretch">
+      <GroupBox Header="TimePicker Features"
+                Margin="0,15,0,0">
+        <Grid>
+          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+
+          <TextBlock Text="StartTime:"
+                     VerticalAlignment="Center" />
+          <xctk:DateTimeUpDown x:Name="_startTime"
+                               Grid.Column="1"
+                               Format="ShortTime"
+                               Value="9:00"
+                               Width="100"
+                               Margin="5" />
+          <TextBlock Text="EndTime:"
+                     Grid.Row="1"
+                     VerticalAlignment="Center" />
+          <xctk:DateTimeUpDown x:Name="_endTime"
+                               Grid.Row="1"
+                               Grid.Column="1"
+                               Format="ShortTime"
+                               Value="17:00"
+                               Width="100"
+                               Margin="5" />
+          <TextBlock Text="TimeInterval:"
+                     Grid.Row="2"
+                     VerticalAlignment="Center" />
+          <xctk:DateTimeUpDown x:Name="_timeInterval"
+                               Grid.Row="2"
+                               Grid.Column="1"
+                               Format="Custom"
+                               FormatString="H:mm"
+                               Value="0:30"
+                               Width="100"
+                               Margin="5" />
+          <TextBlock Grid.Row="3"
+                     Text="MaxDropDownHeight:"
+                     VerticalAlignment="Center" />
+          <xctk:DoubleUpDown x:Name="_maxDropDownHeight"
+                             Grid.Row="3"
+                             Grid.Column="1"
+                             Width="100"
+                             Value="130"
+                             DefaultValue="130"
+                             AllowInputSpecialValues="PositiveInfinity"
+                             Minimum="0" />
+        </Grid>
       </GroupBox>
 
-      <StackPanel Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left">
-            <TextBlock Text="DateTimePicker Usage: " Margin="0,10,0,0" Style="{StaticResource Header}" />
-            <xctk:DateTimePicker x:Name="_datetimePicker"
-                                 Width="300"
-                                 VerticalAlignment="Top"
-                                 IsReadOnly="False"
-                                 Format="{Binding Source={x:Reference _format}, Path=SelectedItem}"
-                                 FormatString="{Binding Text, ElementName=_formatString}"
-                                 Watermark="{Binding  Source={x:Reference _watermark}, Path=Text}"
-                                 TimeFormat="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
-                                 TimeFormatString="{Binding Text, ElementName=_timeFormatString}"
-                                 TimeWatermark="{Binding  Source={x:Reference _timeWatermark}, Path=Text}"
-                                 AutoCloseCalendar="{Binding IsChecked, ElementName=_autoCloseCalendar}"
-                                 ClipValueToMinMax="{Binding IsChecked, ElementName=_clipValueToMinMax}"
-                                 TimePickerVisibility="{Binding Source={x:Reference _timePickerVisibility}, Path=SelectedItem}"
-                                 TimePickerShowButtonSpinner="{Binding IsChecked, ElementName=_timePickerShowButtonSpinner}"
-                                 Minimum="{Binding Value, ElementName=_minimum}"
-                                 Maximum="{Binding Value, ElementName=_maximum}"
-                                 Kind="{Binding SelectedItem, ElementName=_kind}"
-                                 CalendarDisplayMode="{Binding SelectedItem, ElementName=_calendarDisplayMode}"
-                                 CalendarWidth="{Binding Value, ElementName=_calendarWidth}"
-                                 ShowDropDownButton="{Binding IsChecked, ElementName=_showDropDownButton}"
-                                 CurrentDateTimePart="{Binding SelectedItem, ElementName=_currentDateTimePart, Mode=TwoWay}"
-                                 AutoClipTimeParts="{Binding IsChecked, ElementName=_autoClipTimeParts}"/>
-        </StackPanel>
-
-        <StackPanel Grid.Row="1" Grid.Column="1" HorizontalAlignment="Stretch">
-            <GroupBox Header="TimePicker Features" Margin="0,15,0,0">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-
-                    <TextBlock Text="StartTime:" VerticalAlignment="Center" />
-                    <xctk:DateTimeUpDown x:Name="_startTime" Grid.Column="1" Format="ShortTime" Value="9:00" Width="100" Margin="5"/>
-                    <TextBlock Text="EndTime:" Grid.Row="1" VerticalAlignment="Center" />
-                    <xctk:DateTimeUpDown x:Name="_endTime" Grid.Row="1" Grid.Column="1" Format="ShortTime" Value="17:00" Width="100" Margin="5"/>
-                    <TextBlock Text="TimeInterval:" Grid.Row="2" VerticalAlignment="Center" />
-                    <xctk:DateTimeUpDown x:Name="_timeInterval" Grid.Row="2" Grid.Column="1" Format="Custom" FormatString="H:mm" Value="0:30" Width="100" Margin="5"/>
-                    <TextBlock Grid.Row="3" Text="MaxDropDownHeight:" VerticalAlignment="Center" />
-                    <xctk:DoubleUpDown x:Name="_maxDropDownHeight" Grid.Row="3" Grid.Column="1" Width="100" Value="130" DefaultValue="130" AllowInputSpecialValues="PositiveInfinity" Minimum="0" />
-                 </Grid>
-              </GroupBox>
-
-              <StackPanel>
-                <TextBlock Text="TimePicker Usage: " Style="{StaticResource Header}" />
-                <xctk:TimePicker x:Name="_timePicker"
-                                 VerticalAlignment="Top"
-                                 Format="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
-                                 FormatString="{Binding Text, ElementName=_timeFormatString}"
-                                 Watermark="{Binding Source={x:Reference _timeWatermark}, Path=Text}"
-                                 StartTime="{Binding Source={x:Reference _startTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
-                                 EndTime="{Binding Source={x:Reference _endTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
-                                 TimeInterval="{Binding Source={x:Reference _timeInterval}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
-                                 ClipValueToMinMax="{Binding IsChecked, ElementName=_clipValueToMinMax}"
-                                 Minimum="{Binding Value, ElementName=_minimum}"
-                                 Maximum="{Binding Value, ElementName=_maximum}"
-                                 MaxDropDownHeight="{Binding Value, ElementName=_maxDropDownHeight}"
-                                 ShowDropDownButton="{Binding IsChecked, ElementName=_showDropDownButton}"
-                                 AutoClipTimeParts="{Binding IsChecked, ElementName=_autoClipTimeParts}" />
-           </StackPanel>
-        </StackPanel>
-    </Grid>
+      <StackPanel>
+        <TextBlock Text="TimePicker Usage: "
+                   Style="{StaticResource Header}" />
+        <xctk:TimePicker x:Name="_timePicker"
+                         VerticalAlignment="Top"
+                         Format="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
+                         FormatString="{Binding Text, ElementName=_timeFormatString}"
+                         Watermark="{Binding Source={x:Reference _timeWatermark}, Path=Text}"
+                         StartTime="{Binding Source={x:Reference _startTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
+                         EndTime="{Binding Source={x:Reference _endTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
+                         TimeInterval="{Binding Source={x:Reference _timeInterval}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
+                         ClipValueToMinMax="{Binding IsChecked, ElementName=_clipValueToMinMax}"
+                         Minimum="{Binding Value, ElementName=_minimum}"
+                         Maximum="{Binding Value, ElementName=_maximum}"
+                         MaxDropDownHeight="{Binding Value, ElementName=_maxDropDownHeight}"
+                         ShowDropDownButton="{Binding IsChecked, ElementName=_showDropDownButton}"
+                         AutoClipTimeParts="{Binding IsChecked, ElementName=_autoClipTimeParts}" />
+      </StackPanel>
+    </StackPanel>
+  </Grid>
 </local:DemoView>
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 4eab1944..87f6aa7c 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 69887d7e..2e364859 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.cs.txt
index 159d39f0..1fa36388 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -38,5 +38,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ExtendedTabControl.Views
 
 
 
-    }
   }
+}
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.txt
index 82ed3892..0efc30d1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ExtTabControlView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -22,10 +22,10 @@
                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
                 Title="ExtendedTabControl">
 
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The ExtendedTabControl is a TabControl that offers a different navigation style. Instead of displaying the tabs on multiple lines when there are too many to fit in the view, the ExtendedTabContol offers the ability for the user to navigate left/right, and/or use a drop down list.</Run>
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      <Run>The ExtendedTabControl is a TabControl that offers a different navigation style. Instead of displaying the tabs on multiple lines when there are too many to fit in the view, the ExtendedTabContol offers the ability for the user to navigate left/right, and/or use a drop down list.</Run>
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -34,7 +34,9 @@
             Click here for more details about Xceed Toolkit Plus for WPF.
          </Hyperlink>
     </Paragraph>
-   </local:DemoView.Description>
+  </local:DemoView.Description>
+
+
 
 
 
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 de0fd61b..db34ca51 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,7 @@
 
   ************************************************************************************/
 
-using System.Collections.ObjectModel;
 using System.Collections.Specialized;
-using System.Windows;
-using System.Windows.Data;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views
 {
   /// <summary>
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 0b564ae2..bde179ef 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 3615e051..56b2c82e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 4d7b6987..6aa668ae 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7b8591df..91d73b7f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,12 +15,8 @@
 
   ************************************************************************************/
 
-using System;
-using System.IO;
-using System.Windows;
-using System.Windows.Resources;
-using Xceed.Wpf.Samples.SampleData;
 using System.ComponentModel;
+using Xceed.Wpf.Samples.SampleData;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Views
 {
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 c3999de2..983f9d75 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 25862099..1d9ab48b 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -33,7 +33,15 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Views
 
       // Load and display the RTF file.
       Uri uri = new Uri( "pack://application:,,,/" +
-         "Xceed.Wpf.Toolkit.LiveExplorer"
+
+#if NETCORE
+            "Xceed.Wpf.Toolkit.LiveExplorer.NETCore"
+#elif NET5
+            "Xceed.Wpf.Toolkit.LiveExplorer.NET5"
+#else
+            "Xceed.Wpf.Toolkit.LiveExplorer"
+#endif
+
         + ";component/Samples/Magnifier/Resources/SampleText.rtf" );
       StreamResourceInfo info = Application.GetResourceStream( uri );
       using( StreamReader txtReader = new StreamReader( info.Stream ) )
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 fffb13d2..1608c3bb 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 baa7a3b8..f8f20dee 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 6810507d..2de3941e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 f01543b9..b10ec52b 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   **************************************************************************************/
 
 
-using System;
-using System.Collections.Generic;
-using System.Windows;
 using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
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 566baccb..87c9ed34 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 542a2d66..fda03bec 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 4061627a..a2b95079 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e0f571b4..9f08f684 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 6b05ee3a..6b6f551f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 b7263eff..2cb25c2b 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 0b355db5..f542069d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt
index c25d147a..9938c9e1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MaterialDemoView.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,8 +17,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Media;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer
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 fb17a2be..d713e355 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 b860e045..79639dd1 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e8c20bd8..0581e516 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 b8fd5574..7019d573 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 b19bf711..9f6288e5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 769b1dbf..44a72322 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7747a90c..a94f2010 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 dc0f989a..d0c97546 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 087292d1..9cb3101d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,10 +16,7 @@
   **************************************************************************************/
 
 
-using System;
-using System.Collections.Generic;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Media.Animation;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
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 b09c8355..77c2a881 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 df9e8152..4178d498 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,10 +16,7 @@
   **************************************************************************************/
 
 
-using System;
-using System.Collections.Generic;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Media.Animation;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
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 c7e1fe91..d7fc7fdc 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 548bfc7b..d983f7c6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 be2b5998..8d2a77d3 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7b577a81..e37bd6f5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,14 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using Xceed.Wpf.Toolkit.Panels;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 d2f8e316..9b3b14d4 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 3464e945..a405f551 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 dfc8b1a5..6f4c46de 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 57c26a72..2e4b3b4b 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 b3d356f5..2b95642f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e5cb2d78..c3e6ccb7 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 ba95e5a7..895f4f04 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 b06f5c72..d9ab291c 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7d5ff8dc..12f4146f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e7f11356..d83b27f7 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 4f4a54e7..8aaa6e54 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 9816a35f..1e05665c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/MultiCalendarView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,10 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls;
 using System;
-using System.Windows.Media;
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views
 {
@@ -43,5 +43,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views
 
 
 
-      }
+  }
 }
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 af4361cc..94b96691 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 883a275a..5f5e3103 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,6 @@
 
   *************************************************************************************/
 
-using System.Data;
-using System.Diagnostics;
 using System.Windows.Controls;
 using System.Windows.Data;
 using Xceed.Wpf.Samples.SampleData;
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 e3de1ca4..eea49bb4 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 90748889..223ec24f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 518398ec..483b245e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7cf2ab99..5b72a51f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,7 +17,6 @@
 
 using System.Collections.Generic;
 using System.Globalization;
-using System;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views
 {
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 6c576e2c..a11713e5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 ff36906b..c0ee5ae8 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   ************************************************************************************/
 
-using System.Windows.Data;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views
 {
   /// <summary>
@@ -29,5 +26,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views
     {
       InitializeComponent();
     }
-  } 
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PieChartView.xaml.txt
index dd23dc49..a952ec92 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 6c041310..b3c2ec22 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,6 @@
 
   ************************************************************************************/
 
-using System.Windows.Data;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views
 {
   /// <summary>
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 03492d51..c210046e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 f09328af..79c01879 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,14 +15,7 @@
 
   **************************************************************************************/
 
-using System.Windows.Data;
-using System.Windows.Media;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
 using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views
 {
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 8df6b348..b6ceb68a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 5e2be371..6b221b73 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,17 +15,14 @@
 
   *************************************************************************************/
 
-using System.Windows.Media;
-using System.Windows.Controls;
 using System;
-using System.Diagnostics;
-using System.Windows;
-using Xceed.Wpf.Toolkit;
+using System.Collections.ObjectModel;
 using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Xceed.Wpf.Samples.SampleData;
-using System.Collections.ObjectModel;
-using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Views
 {
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 6fdc00e4..376dc070 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAdvancedContextMenuView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAdvancedContextMenuView.xaml.cs.txt
index 391d6e3a..7969e2d3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAdvancedContextMenuView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridAdvancedContextMenuView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,21 +15,9 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-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.Shapes;
 using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
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 a5e85d93..d43fc71f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,7 +15,6 @@
 
   *************************************************************************************/
 
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
@@ -53,7 +52,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     }
   }
 
-  [CategoryOrder("Information", 0)]
+  [CategoryOrder( "Information", 0 )]
   [CategoryOrder( "Conections", 1 )]
   [CategoryOrder( "Other", 2 )]
   public abstract class Person : INotifyPropertyChanged
@@ -64,60 +63,95 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     [Category( "Information" )]
     [Description( "This property uses the [DisplayName(\"Is a Men\")] attribute to customize the name of this property." )]
     [DisplayName( "Is male" )]
-    public bool IsMale { get; set; }
+    public bool IsMale
+    {
+      get; set;
+    }
 
     [Category( "Information" )]
     [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'FirstNameEditor' class. In the Plus version, it also depends on the IsMale property to change its foreground and source." )]
     [Editor( typeof( FirstNameEditor ), typeof( FirstNameEditor ) )]
     public string FirstName
     {
-      get{ return _firstName; }
-      set{ _firstName = value; OnPropertyChanged( "FirstName" );}
+      get
+      {
+        return _firstName;
+      }
+      set
+      {
+        _firstName = value;
+        OnPropertyChanged( "FirstName" );
+      }
     }
     private string _firstName;
 
     [Category( "Information" )]
     [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'LastNameUserControlEditor' user control." )]
     [Editor( typeof( LastNameUserControlEditor ), typeof( LastNameUserControlEditor ) )]
-    [DefaultValue("Friend")]
+    [DefaultValue( "Friend" )]
     public string LastName
     {
-      get{ return _lastName; }
-      set{ _lastName = value; OnPropertyChanged( "LastName" );}
+      get
+      {
+        return _lastName;
+      }
+      set
+      {
+        _lastName = value;
+        OnPropertyChanged( "LastName" );
+      }
     }
     private string _lastName;
 
     [Category( "Conections" )]
     [Description( "This property uses the [NewItemTypes(...)] attribute to provide the underlying CollectionEditor with class types (eg. Man, Woman) that can be inserted in the collection." )]
     [NewItemTypes( typeof( Man ), typeof( Woman ) )]
-    public List<Person> Friends { get; set; }
+    public List<Person> Friends
+    {
+      get; set;
+    }
 
     [Category( "Information" )]
     [DisplayName( "Writing Font Size" )]
     [Description( "This property defines the [ItemsSource(..)] attribute that allows you to specify a ComboBox editor and control its items." )]
     [ItemsSource( typeof( FontSizeItemsSource ) )]
     [RefreshProperties( RefreshProperties.All )]    //This will reload the PropertyGrid
-    public double WritingFontSize { get; set; }
+    public double WritingFontSize
+    {
+      get; set;
+    }
 
     [Category( "Conections" )]
     [Description( "This property defines the [ExpandableObject()] attribute. This allows you to expand this property and drill down through its values." )]
     [ExpandableObject()]
-    public Person Spouse { get; set; }
+    public Person Spouse
+    {
+      get; set;
+    }
 
     [Category( "Other" )]
     [Description( "This property uses the [PropertyOrder(1)] attribute to control its position in the categorized and non-categorized views. Otherwise, alphabetical order is used." )]
     [PropertyOrder( 1 )]
-    public string A_SecondProperty { get; set; }
+    public string A_SecondProperty
+    {
+      get; set;
+    }
 
     [Category( "Other" )]
     [Description( "This property uses the [PropertyOrder(0)] attribute to control its position in the categorized and non-categorized view. Otherwise, alphabetical order is used." )]
     [PropertyOrder( 0 )]
-    public string B_FirstProperty { get; set; }
+    public string B_FirstProperty
+    {
+      get; set;
+    }
 
     [Category( "Other" )]
     [Description( "This property uses the [ParenthesizePropertyName()] attribute to force the name to be displayed within round brackets." )]
-    [ParenthesizePropertyNameAttribute(true)]
-    public string NameInParentheses { get; set; }
+    [ParenthesizePropertyNameAttribute( true )]
+    public string NameInParentheses
+    {
+      get; set;
+    }
 
     [Category( "Other" )]
     [Description( "This property uses the [Browsable(false)] attribute to not display the property" )]
@@ -128,9 +162,9 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       set;
     }
 
-    [Range(0d, 10d)]
+    [Range( 0d, 10d )]
     [Category( "Other" )]
-    [DefaultValue(5d)]
+    [DefaultValue( 5d )]
     [Description( "This property uses the [Range(0,10)] and DefaultValue attributes to set the Minimum, Maximum and default properties." )]
     public double RangeDouble
     {
@@ -166,15 +200,27 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
             , GroupName = "Information"
             , AutoGenerateField = true
             , AutoGenerateFilter = false )]
-    public string FavoriteSport { get; set; }
-    public Man() { this.IsMale = true; }
+    public string FavoriteSport
+    {
+      get; set;
+    }
+    public Man()
+    {
+      this.IsMale = true;
+    }
   }
   public class Woman : Person
   {
     [Category( "Information" )]
     [Description( "This property has no special attribute besides [Categroy(\"Information\")] and [Description(...)]" )]
-    public string FavoriteRestaurant { get; set; }
-    public Woman() { this.IsMale = false; }
+    public string FavoriteRestaurant
+    {
+      get; set;
+    }
+    public Woman()
+    {
+      this.IsMale = false;
+    }
   }
 
   // This is the custom editor referenced by the "EditorAttribute"
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 903eac74..adfaa68e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 63ccdb01..46aca0d5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,7 @@
 
   ************************************************************************************/
 
-using System;
 using System.ComponentModel;
-using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
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 31305ffb..93af39e6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 c51fee6e..2b34ff74 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,13 +15,8 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Windows;
-using System.Windows.Media;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
@@ -40,35 +35,63 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     [CategoryOrder( "Information", 1 )]
     [CategoryOrder( "Hobbies", 2 )]
     [CategoryOrder( "Connections", 3 )]
-    public class PersonOrdered : PersonBase { }
+    public class PersonOrdered : PersonBase
+    {
+    }
 
-    public class PersonNonOrdered : PersonBase { }
+    public class PersonNonOrdered : PersonBase
+    {
+    }
 
     public abstract class PersonBase
     {
       [Category( "Information" )]
-      public string FirstName { get; set; }
+      public string FirstName
+      {
+        get; set;
+      }
 
       [Category( "Information" )]
-      public string LastName { get; set; }
+      public string LastName
+      {
+        get; set;
+      }
 
       [Category( "Hobbies" )]
-      public bool Baseball { get; set; }
+      public bool Baseball
+      {
+        get; set;
+      }
 
       [Category( "Hobbies" )]
-      public bool Football { get; set; }
+      public bool Football
+      {
+        get; set;
+      }
 
       [Category( "Hobbies" )]
-      public bool Basketball { get; set; }
+      public bool Basketball
+      {
+        get; set;
+      }
 
       [Category( "Connections" )]
-      public string Father { get; set; }
+      public string Father
+      {
+        get; set;
+      }
 
       [Category( "Connections" )]
-      public string Mother { get; set; }
+      public string Mother
+      {
+        get; set;
+      }
 
       [Category( "Connections" )]
-      public bool HasChildren { get; set; }
+      public bool HasChildren
+      {
+        get; set;
+      }
 
       public static PersonBase InitPerson( PersonBase person )
       {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridCategoryOrderView.xaml.txt
index 8d999818..3eb01769 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 d9a8a095..7d8f62d6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,15 +15,10 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Media;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
@@ -121,7 +116,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       }
 
       [Category( "Information" )]
-      [Browsable(false)]
+      [Browsable( false )]
       [Description( "This property is not displayed in the PropertyGrid, but its used as the selectedItem of the ComboBox for the 'Friends' property Editor." )]
       public Friend BestFriend
       {
@@ -151,7 +146,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       {
         get;
         set;
-      }     
+      }
     }
 
     public class Friend
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 9b45018f..bc1436af 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 31225428..0279b257 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,14 +15,6 @@
 
   ************************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Media;
-using System.Linq;
-using System.Collections.ObjectModel;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
   /// <summary>
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 5ea650f7..2aef7fc6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 f43e281f..bfad53bf 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,7 +16,6 @@
   ************************************************************************************/
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -41,7 +40,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       selectedObject.Color = Colors.Blue;
       selectedObject.DateTime = System.DateTime.Now;
       selectedObject.Decimal = ( decimal )2;
-      selectedObject.Double = (double)3;
+      selectedObject.Double = ( double )3;
       selectedObject.Enum = HorizontalAlignment.Center;
       selectedObject.FontFamily = new FontFamily( "Arial" );
       selectedObject.FontStretch = FontStretches.Normal;
@@ -51,21 +50,21 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       selectedObject.Char = 'T';
       selectedObject.Password = "This is my password";
       selectedObject.Int16 = ( short )4;
-      selectedObject.Int32 = (int)5;
-      selectedObject.Int64 = (long)6;
+      selectedObject.Int32 = ( int )5;
+      selectedObject.Int64 = ( long )6;
       selectedObject.ListOfInt32 = new List<int>() { 1, 2, 3 };
       selectedObject.ListOfPerson = new List<Person>() { new Person() { Name = "John Smith" }, new Person() { Name = "Robert King" } };
       selectedObject.ListOfStrings = new List<string>() { "string1", "string2", "string3" };
       selectedObject.Dictionary = new Dictionary<int, System.Windows.Media.Color>() { { 22, System.Windows.Media.Color.FromRgb( 255, 0, 0 ) }, { 33, System.Windows.Media.Color.FromRgb( 0, 255, 0 ) } };
       selectedObject.CollectionOfPerson = new Collection<Person>() { new Person() { Name = "Tom McNeil" }, new Person() { Name = "Mike Campbell" } };
       selectedObject.Person = new Person() { Name = "John Smith" };
-      selectedObject.SByte = (sbyte) 7;
-      selectedObject.Single = (float)8;
+      selectedObject.SByte = ( sbyte )7;
+      selectedObject.Single = ( float )8;
       selectedObject.String = "this is a string";
-      selectedObject.TimeSpan = System.TimeSpan.FromHours( 2 );      
-      selectedObject.UInt16 = (ushort)9;
-      selectedObject.UInt32 = (uint)10;
-      selectedObject.UInt64 = (ulong)11;
+      selectedObject.TimeSpan = System.TimeSpan.FromHours( 2 );
+      selectedObject.UInt16 = ( ushort )9;
+      selectedObject.UInt32 = ( uint )10;
+      selectedObject.UInt64 = ( ulong )11;
 
       this.DataContext = selectedObject;
     }
@@ -74,25 +73,46 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     {
       [Category( "Non-Numeric Editors" )]
       [Description( "(C# string type) This property uses a TextBox as the default editor." )]
-      public string String { get; set; }
+      public string String
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "(C# bool type) This property uses a CheckBox as the default editor." )]
-      public bool Boolean { get; set; }
+      public bool Boolean
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# int type) This property uses an IntegerUpDown as the default editor." )]
-      public int Int32 { get; set; }
+      public int Int32
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# double type) This property uses a DoubleUpDown as the default editor." )]
-      public double Double { get; set; }
+      public double Double
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# short type) This property uses a ShortUpDown as the default editor." )]
-      public short Int16 { get; set; }
+      public short Int16
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# long type) This property uses a LongUpDown as the default editor." )]
-      public long Int64 { get; set; }
+      public long Int64
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# float type) This property uses a SingleUpDown as the default editor." )]
-      public float Single { get; set; }      
+      public float Single
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# decimal type) This property uses a Decimal as the default editor." )]
       public decimal Decimal
@@ -102,64 +122,124 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       }
       [Category( "Numeric Editors" )]
       [Description( "(C# byte type) This property uses a ByteUpDown as the default editor." )]
-      public byte Byte { get; set; }
+      public byte Byte
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# sbyte type) This property uses a SByteUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )]
-      public sbyte SByte { get; set; }
+      public sbyte SByte
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# uint type) This property uses a UInteger as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )]
-      public uint UInt32 { get; set; }
+      public uint UInt32
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# ulong type) This property uses a ULongUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )]
-      public ulong UInt64 { get; set; }
+      public ulong UInt64
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# ushort type) This property uses a UShortUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )]
-      public ushort UInt16 { get; set; }
+      public ushort UInt16
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a DateTimeUpDown as the default editor." )]
-      public System.DateTime DateTime { get; set; }
+      public System.DateTime DateTime
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a TimeSpanUpDown as the default editor." )]
-      public System.TimeSpan TimeSpan { get; set; }
+      public System.TimeSpan TimeSpan
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a ColorPicker as the default editor." )]
-      public System.Windows.Media.Color? Color { get; set; }
+      public System.Windows.Media.Color? Color
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "(C# enum type) This property uses a ComboBox as the default editor. The ComboBox is auto-populated with the enum values." )]
-      public HorizontalAlignment Enum { get; set; }
+      public HorizontalAlignment Enum
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a ComboBox as the default editor." )]
-      public FontFamily FontFamily { get; set; }
+      public FontFamily FontFamily
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a ComboBox as the default editor." )]
-      public FontWeight FontWeight { get; set; }
+      public FontWeight FontWeight
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a ComboBox as the default editor." )]
-      public FontStyle FontStyle { get; set; }
+      public FontStyle FontStyle
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a ComboBox as the default editor." )]
-      public FontStretch FontStretch { get; set; }
+      public FontStretch FontStretch
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a Guid as the default editor." )]
-      public Guid Guid { get; set; }
+      public Guid Guid
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a Char as the default editor." )]
-      public Char Char { get; set; }
+      public Char Char
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
-      [PasswordPropertyText(true)]
-      public string Password { get; set; }
+      [PasswordPropertyText( true )]
+      public string Password
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a PrimitiveTypeCollectionEditor as the default editor." )]
-      public List<string> ListOfStrings { get; set; }
+      public List<string> ListOfStrings
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a PrimitiveTypeCollectionEditor as the default editor." )]
-      public List<int> ListOfInt32 { get; set; }
+      public List<int> ListOfInt32
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "(C# IList<T> type) This property uses a CollectionEditor as the default editor." )]
-      public List<Person> ListOfPerson { get; set; }
+      public List<Person> ListOfPerson
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "(C# IDictionary<T> type) This property uses a CollectionEditor as the default editor." )]
-      public Dictionary<int, System.Windows.Media.Color> Dictionary { get; set; }
+      public Dictionary<int, System.Windows.Media.Color> Dictionary
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "(C# ICollection<T> type) This property uses a CollectionEditor as the default editor." )]
       public Collection<Person> CollectionOfPerson
@@ -168,12 +248,18 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property is a complex property and has no default editor." )]
-      public Person Person { get; set; }
+      public Person Person
+      {
+        get; set;
+      }
     }
 
     public class Person
     {
-      public string Name { get; set; }
+      public string Name
+      {
+        get; set;
+      }
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridDefaultEditorsView.xaml.txt
index a3fcdfcc..8b0aafe3 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 37d2aa84..00fe8330 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,7 @@
 
   *************************************************************************************/
 
-using System;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
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 d270544f..b4655a28 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 ab636d35..485816f5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,18 +15,11 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Windows;
-using System.Windows.Media;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 using Xceed.Wpf.Toolkit.Core;
 using System.Windows.Controls;
 using System.Globalization;
-using System.Threading;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
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 898aed3f..beb1b2b5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs.txt
index d5185036..c6929d86 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,20 +15,8 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-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.Shapes;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.txt
index 6a8a7e9d..53246df5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.txt
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridEditorComboBoxDefinitionSourceView.xaml.txt
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 8cb06e2b..8030ad9b 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,7 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
-using System.Windows;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
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 78eb8dc9..aebc4396 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 be70ae8c..13d8a7c8 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 f71b6b24..60503663 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 04fe90bd..30db9605 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,20 +15,7 @@
 
   *************************************************************************************/
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
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 a0e52902..73cd4209 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 2a9b711a..9bf0e254 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,13 +15,11 @@
 
   *************************************************************************************/
 
-using System;
 using System.Collections.Generic;
-using System.ComponentModel;
+using System.Collections.ObjectModel;
+using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using System.Linq;
-using System.Collections.ObjectModel;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
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 9796c689..28d6c541 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 3b3e67bc..47a4bbaa 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,14 +15,6 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Media;
-using System.Linq;
-using System.Collections.ObjectModel;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
   /// <summary>
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 283305a8..1ed17f25 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 ecba244a..6b760fdb 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,8 @@
 
   ************************************************************************************/
 
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 using Xceed.Wpf.Toolkit.PropertyGrid;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
@@ -39,7 +39,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     {
       var propertyItem = e.PropertyItem as PropertyItem;
       // Parent of top-level properties is the PropertyGrid itself.
-      bool isTopLevelProperty = 
+      bool isTopLevelProperty =
         ( propertyItem.ParentElement is Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid );
 
       if( isTopLevelProperty && propertyItem.PropertyDescriptor.Name == "Friend" )
@@ -50,10 +50,19 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 
     private class Person
     {
-      public string FirstName { get; set; }
-      public string LastName { get; set; }
+      public string FirstName
+      {
+        get; set;
+      }
+      public string LastName
+      {
+        get; set;
+      }
       [ExpandableObject()]
-      public Person Friend { get; set; }
+      public Person Friend
+      {
+        get; set;
+      }
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridPropertyItemStyleView.xaml.txt
index ba1fb271..8fb2e83d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -23,30 +23,30 @@
                 xmlns:s="clr-namespace:System;assembly=mscorlib"
                 VerticalScrollBarVisibility="Disabled"
                 Title="Customizing PropertyItems display">
-    <local:DemoView.Description>
-        <Paragraph FontSize="14" FontFamily="Segoe">
-         This sample demonstrates the usage of the PropertyGrid's
-         <Bold>PropertyContainerStyle</Bold> property and
-         <Bold>PreparePropertyItem</Bold> event to customize the display of the PropertyGrid content.
-      </Paragraph>
-    </local:DemoView.Description>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-      <StackPanel Grid.Row="0" Margin="10" >
-         <TextBlock Text="Using the PropertyContainerStyle property, the Foreground of all properties are set to Red."
+  <local:DemoView.Description>
+    <Paragraph FontSize="14" FontFamily="Segoe">
+      This sample demonstrates the usage of the PropertyGrid's
+      <Bold>PropertyContainerStyle</Bold> property and
+      <Bold>PreparePropertyItem</Bold> event to customize the display of the PropertyGrid content.
+    </Paragraph>
+  </local:DemoView.Description>
+
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
+    <StackPanel Grid.Row="0" Margin="10" >
+      <TextBlock Text="Using the PropertyContainerStyle property, the Foreground of all properties are set to Red."
                     TextWrapping="Wrap"
                     Margin="0,0,0,10"/>
-         <TextBlock Text="Using the PreparePropertyItem event, the display name of the property 'Friend' is changed to 'Friend (renamed)'."
+      <TextBlock Text="Using the PreparePropertyItem event, the display name of the property 'Friend' is changed to 'Friend (renamed)'."
                     TextWrapping="Wrap"
-                    Margin="0,0,0,10"/>         
-         <TextBlock Text="(CLick the XAML and Code tabs to see details,)" 
+                    Margin="0,0,0,10"/>
+      <TextBlock Text="(CLick the XAML and Code tabs to see details,)" 
                     FontStyle="Italic"
                     Margin="0,10,0,0"/>
-      </StackPanel>
+    </StackPanel>
 
 
       <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="1" Width="350" MaxHeight="300"
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 596cda37..e952cdc7 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,6 @@
 
   *************************************************************************************/
 
-using System;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
   /// <summary>
@@ -29,7 +27,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       InitializeComponent();
     }
 
-    private void OnControlGetFocus(object sender, System.Windows.RoutedEventArgs e)
+    private void OnControlGetFocus( object sender, System.Windows.RoutedEventArgs e )
     {
       _propertyGrid.SelectedObject = e.Source;
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/PropertyGridSelectedObjectView.xaml.txt
index 052462a7..ab668c39 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 9ed6f447..e15b28cb 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e4f99919..ec0eddea 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 60e63a1e..1436775a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,6 @@
 
   ************************************************************************************/
 
-using System;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
   /// <summary>
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 9483ac82..5bac6876 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 61a7de60..31427e80 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,10 +16,7 @@
   ***********************************************************************************/
 
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Windows;
-using Xceed.Wpf.Toolkit;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Gauge.Views
 {
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 ce8ed6b3..afd1e851 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 b4bdba20..7a4767c2 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   ***********************************************************************************/
 
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Windows.Controls;
 using System.Windows.Media;
 
@@ -35,14 +32,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Views
 
     private void RangeStyleComboBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
     {
-      if( e.AddedItems.Count > 0 && e.AddedItems[ 0 ] is ComboBoxItem)
+      if( e.AddedItems.Count > 0 && e.AddedItems[ 0 ] is ComboBoxItem )
       {
         ComboBoxItem item = e.AddedItems[ 0 ] as ComboBoxItem;
         //A style different from null is chosen
         if( item.Tag != null )
         {
           //LowerRangeBackground is Transparent, force a color
-          if( object.Equals( sender, lowerRangeStyleComboBox ) && ((SolidColorBrush)_rangeSlider.LowerRangeBackground).Color.Equals( Colors.Transparent) )
+          if( object.Equals( sender, lowerRangeStyleComboBox ) && ( ( SolidColorBrush )_rangeSlider.LowerRangeBackground ).Color.Equals( Colors.Transparent ) )
           {
             _rangeSlider.LowerRangeBackground = new SolidColorBrush( Colors.Green );
           }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/RangeSliderView.xaml.txt
index 8c30acf2..5def958c 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 4939998b..931d252d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,8 +16,6 @@
   ***********************************************************************************/
 
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Rating.Views
 {
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 67f07fdc..9b827188 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 98121225..a133f473 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,11 +16,6 @@
   *************************************************************************************/
 
 using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using System;
-using System.Windows.Resources;
-using System.Windows;
-using System.IO;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views
 {
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 911d8640..25da7bca 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 6dca4841..4ab24bb2 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,32 +15,24 @@
 
   ***********************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
-using Xceed.Wpf.Samples.SampleData;
-using System.Windows.Media.Imaging;
-using System.IO;
+using System.Windows.Controls;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.SlideShow.Views
 {
-    /// <summary>
-    /// Interaction logic for SlideShow.xaml
-    /// </summary>
-    public partial class SlideShowView : DemoView
+  /// <summary>
+  /// Interaction logic for SlideShow.xaml
+  /// </summary>
+  public partial class SlideShowView : DemoView
+  {
+    public SlideShowView()
     {
-        public SlideShowView()
-        {
-            InitializeComponent();
-
+      InitializeComponent();
 
-      }
 
     }
+
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SlideShowView.xaml.txt
index 7a38544a..a170964a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 379ab694..12091dda 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,22 +15,9 @@
 
   *************************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Xceed.Wpf.Toolkit;
-using System.ComponentModel;
-using System.Diagnostics;
-using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 {
@@ -53,7 +40,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
     public StyleableWindowView()
     {
       InitializeComponent();
-      this.UpdateWindowsStyles(null,null);
+      this.UpdateWindowsStyles( null, null );
     }
 
 
@@ -81,7 +68,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
       msgBox.DataContext = this.DataContext;
       msgBox.Text = StyledMsgBoxMessage;
       msgBox.Caption = StyledMsgBoxTitle;
-      if( _enableStyleCheckBox.IsChecked.GetValueOrDefault() ) 
+      if( _enableStyleCheckBox.IsChecked.GetValueOrDefault() )
       {
         msgBox.Style = ( Style )this.Resources[ MessageBoxStyleKey ];
       }
@@ -117,8 +104,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Brush WindowBackground
     {
-      get { return ( Brush )GetValue( WindowBackgroundProperty ); }
-      set { SetValue( WindowBackgroundProperty, value ); }
+      get
+      {
+        return ( Brush )GetValue( WindowBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WindowBackgroundProperty, value );
+      }
     }
 
     #endregion //WindowBackground
@@ -149,12 +142,21 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Brush WindowBorderBrush
     {
-      get { return ( Brush )GetValue( WindowBorderBrushProperty ); }
-      set { SetValue( WindowBorderBrushProperty, value ); }
+      get
+      {
+        return ( Brush )GetValue( WindowBorderBrushProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderBrushProperty, value );
+      }
     }
 
     #endregion //WindowBorderBrush
 
+
+
+
     #region TitleFontSize
 
     public static readonly DependencyProperty TitleFontSizeProperty =
@@ -164,7 +166,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
     {
       get
       {
-        return (double)GetValue( TitleFontSizeProperty );
+        return ( double )GetValue( TitleFontSizeProperty );
       }
       set
       {
@@ -181,8 +183,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Brush TitleForeground
     {
-      get { return ( Brush )GetValue( TitleForegroundProperty ); }
-      set { SetValue( TitleForegroundProperty, value ); }
+      get
+      {
+        return ( Brush )GetValue( TitleForegroundProperty );
+      }
+      set
+      {
+        SetValue( TitleForegroundProperty, value );
+      }
     }
 
     #endregion //TitleForeground
@@ -213,8 +221,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Thickness WindowBorderThickness
     {
-      get { return ( Thickness )GetValue( WindowBorderThicknessProperty ); }
-      set { SetValue( WindowBorderThicknessProperty, value ); }
+      get
+      {
+        return ( Thickness )GetValue( WindowBorderThicknessProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderThicknessProperty, value );
+      }
     }
 
     #endregion //WindowBorderThickness
@@ -226,8 +240,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public double WindowOpacity
     {
-      get { return ( double )GetValue( WindowOpacityProperty ); }
-      set { SetValue( WindowOpacityProperty, value ); }
+      get
+      {
+        return ( double )GetValue( WindowOpacityProperty );
+      }
+      set
+      {
+        SetValue( WindowOpacityProperty, value );
+      }
     }
 
     #endregion //WindowOpacity
@@ -239,8 +259,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public WindowStyle WindowStyle
     {
-      get { return ( WindowStyle )GetValue( WindowStyleProperty ); }
-      set { SetValue( WindowStyleProperty, value ); }
+      get
+      {
+        return ( WindowStyle )GetValue( WindowStyleProperty );
+      }
+      set
+      {
+        SetValue( WindowStyleProperty, value );
+      }
     }
 
     #endregion //WindowStyle
@@ -252,8 +278,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public ResizeMode ResizeMode
     {
-      get { return ( ResizeMode )GetValue( ResizeModeProperty ); }
-      set { SetValue( ResizeModeProperty, value ); }
+      get
+      {
+        return ( ResizeMode )GetValue( ResizeModeProperty );
+      }
+      set
+      {
+        SetValue( ResizeModeProperty, value );
+      }
     }
 
     #endregion //ResizeMode
@@ -264,8 +296,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Visibility CloseButtonVisibility
     {
-      get { return ( Visibility )GetValue( CloseButtonVisibilityProperty ); }
-      set { SetValue( CloseButtonVisibilityProperty, value ); }
+      get
+      {
+        return ( Visibility )GetValue( CloseButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonVisibilityProperty, value );
+      }
     }
     #endregion //CloseButtonVisibility
 
@@ -275,8 +313,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Style CloseButtonStyle
     {
-      get { return ( Style )GetValue( CloseButtonStyleProperty ); }
-      set { SetValue( CloseButtonStyleProperty, value ); }
+      get
+      {
+        return ( Style )GetValue( CloseButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonStyleProperty, value );
+      }
     }
     #endregion //CloseButtonStyle
 
@@ -286,8 +330,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Style MinimizeButtonStyle
     {
-      get { return ( Style )GetValue( MinimizeButtonStyleProperty ); }
-      set { SetValue( MinimizeButtonStyleProperty, value ); }
+      get
+      {
+        return ( Style )GetValue( MinimizeButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( MinimizeButtonStyleProperty, value );
+      }
     }
     #endregion //MinimizeButtonStyle
 
@@ -297,8 +347,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Style MaximizeButtonStyle
     {
-      get { return ( Style )GetValue( MaximizeButtonStyleProperty ); }
-      set { SetValue( MaximizeButtonStyleProperty, value ); }
+      get
+      {
+        return ( Style )GetValue( MaximizeButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( MaximizeButtonStyleProperty, value );
+      }
     }
     #endregion //MaximizeButtonStyle
 
@@ -308,8 +364,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Style RestoreButtonStyle
     {
-      get { return ( Style )GetValue( RestoreButtonStyleProperty ); }
-      set { SetValue( RestoreButtonStyleProperty, value ); }
+      get
+      {
+        return ( Style )GetValue( RestoreButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( RestoreButtonStyleProperty, value );
+      }
     }
     #endregion //RestoreButtonStyle
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/StyleableWindowView.xaml.txt
index 047dbe33..5aea3ece 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,126 +15,175 @@
 
   **************************************************************************************-->
 <local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views.StyleableWindowView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
-                 xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views"
-                 xmlns:res="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources"
-                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="StyleableWindows" >
-   <local:DemoView.Description>
-      <Paragraph FontSize="14" FontFamily="Segoe">
-         <Run>It is possible to style ChildWindow controls as well as MessageBox controls. All the chrome of their window can be styled (color, thickness, opacity); their action buttons can also be styled.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>The "Plus" version provides a new control called StyleableWindow, which consists of a window that has all the functions of a normal window, but which can be styled in the same way as ChildWindow or MessageBox.</Run>
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views"
+                xmlns:res="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                Title="StyleableWindows">
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      <Run>It is possible to style ChildWindow controls as well as MessageBox controls. All the chrome of their window can be styled (color, thickness, opacity); their action buttons can also be styled.</Run>
+      <LineBreak />
+      <LineBreak />
+      <Run>The "Plus" version provides a new control called StyleableWindow, which consists of a window that has all the functions of a normal window, but which can be styled in the same way as ChildWindow or MessageBox.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Toolkit Plus for WPF.
             </Hyperlink>
 
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="/Samples/Window/Resources/FancyStyles.xaml"/>
-         </ResourceDictionary.MergedDictionaries>
-
-         <conv:WindowStateToBoolConverter x:Key="windowStateBoolConv" />
-
-         <!--Base style for ChildWindowStyle and MessageBoxStyle-->
-         <Style x:Key="windowControlStyle" TargetType="{x:Type xctk:WindowControl}">
-            <Setter Property="WindowBackground" Value="{Binding WindowBackground}" />
-            <Setter Property="WindowBorderBrush" Value="{Binding WindowBorderBrush}" />
-            <Setter Property="WindowBorderThickness" Value="{Binding WindowBorderThickness}" />
-            <Setter Property="WindowInactiveBackground" Value="{Binding WindowInactiveBackground}" />
-            <Setter Property="WindowOpacity" Value="{Binding WindowOpacity}" />
-            <Setter Property="CaptionFontSize" Value="{Binding TitleFontSize}" />
-            <Setter Property="CaptionForeground" Value="{Binding TitleForeground}" />
-            <Setter Property="CaptionShadowBrush" Value="{Binding TitleShadowBrush}" />
-            <Setter Property="CloseButtonStyle" Value="{Binding CloseButtonStyle}" />
-         </Style>
-
-         <!--Style for the MessageBox-->
-         <Style x:Key="messageBoxStyle" TargetType="{x:Type xctk:MessageBox}" BasedOn="{StaticResource windowControlStyle}">
-            <Setter Property="ButtonRegionBackground" Value="{StaticResource FancyButtonRegionBackground}" />
-            <Setter Property="OkButtonStyle" Value="{StaticResource FancyButtonStyle}" />
-            <Setter Property="CancelButtonStyle" Value="{StaticResource FancyButtonStyle}" />
-            <Setter Property="YesButtonStyle" Value="{StaticResource FancyButtonStyle}" />
-            <Setter Property="NoButtonStyle" Value="{StaticResource FancyButtonStyle}" />
-         </Style>
-
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-
-
-
-   <local:DemoView.DataContext>
-      <!--A model containing the brushes and other properties was created to share theses values
+    </Paragraph>
+  </local:DemoView.Description>
+
+  <local:DemoView.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="/Samples/Window/Resources/FancyStyles.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+
+      <conv:WindowStateToBoolConverter x:Key="windowStateBoolConv" />
+
+      <!--Base style for ChildWindowStyle and MessageBoxStyle-->
+      <Style x:Key="windowControlStyle"
+             TargetType="{x:Type xctk:WindowControl}">
+        <Setter Property="WindowBackground"
+                Value="{Binding WindowBackground}" />
+        <Setter Property="WindowBorderBrush"
+                Value="{Binding WindowBorderBrush}" />
+        <Setter Property="WindowBorderThickness"
+                Value="{Binding WindowBorderThickness}" />
+        <Setter Property="WindowInactiveBackground"
+                Value="{Binding WindowInactiveBackground}" />
+        <Setter Property="WindowOpacity"
+                Value="{Binding WindowOpacity}" />
+        <Setter Property="CaptionFontSize"
+                Value="{Binding TitleFontSize}" />
+        <Setter Property="CaptionForeground"
+                Value="{Binding TitleForeground}" />
+        <Setter Property="CaptionShadowBrush"
+                Value="{Binding TitleShadowBrush}" />
+        <Setter Property="CloseButtonStyle"
+                Value="{Binding CloseButtonStyle}" />
+      </Style>
+
+      <!--Style for the MessageBox-->
+      <Style x:Key="messageBoxStyle"
+             TargetType="{x:Type xctk:MessageBox}"
+             BasedOn="{StaticResource windowControlStyle}">
+        <Setter Property="ButtonRegionBackground"
+                Value="{StaticResource FancyButtonRegionBackground}" />
+        <Setter Property="OkButtonStyle"
+                Value="{StaticResource FancyButtonStyle}" />
+        <Setter Property="CancelButtonStyle"
+                Value="{StaticResource FancyButtonStyle}" />
+        <Setter Property="YesButtonStyle"
+                Value="{StaticResource FancyButtonStyle}" />
+        <Setter Property="NoButtonStyle"
+                Value="{StaticResource FancyButtonStyle}" />
+      </Style>
+
+    </ResourceDictionary>
+  </local:DemoView.Resources>
+
+
+
+  <local:DemoView.DataContext>
+    <!--A model containing the brushes and other properties was created to share theses values
       between ChildWindow, MessageBox, and StyleableWindow.-->
-      <view:WindowModel
-         WindowBackground="#FFC72035"
-         WindowBorderBrush="Black"
-         WindowBorderThickness="2"
-         WindowInactiveBackground="LightGray"
-         WindowOpacity="0.75"
-         WindowStyle="SingleBorderWindow"
-         TitleForeground="Brown"
-         TitleShadowBrush="White"
-         TitleFontSize="15"
-         ResizeMode="CanResize"
-         CloseButtonVisibility="Visible" 
-         CloseButtonStyle="{StaticResource FancyButtonCloseStyle}"
-         MinimizeButtonStyle="{StaticResource FancyButtonMinimizeStyle}"
-         MaximizeButtonStyle="{StaticResource FancyButtonMaximizeStyle}"
-         RestoreButtonStyle="{StaticResource FancyButtonRestoreStyle}"/>
-   </local:DemoView.DataContext>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-      </StackPanel>
-
-      <Grid Grid.Row="1">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*"/>
-         </Grid.ColumnDefinitions>
-
-         <GroupBox Header="Features" Margin="5" VerticalAlignment="Stretch">
-            <StackPanel HorizontalAlignment="Center">
-               <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
-                  <TextBlock Text="Show ChildWindow:" VerticalAlignment="Center" Width="120"/>
-                  <CheckBox IsChecked="{Binding WindowState, ElementName=_childWindow, Converter={StaticResource windowStateBoolConv}}"
-                            Margin="5,0,0,0"
-                            VerticalAlignment="Center"/>
-               </StackPanel>
-               <StackPanel Orientation="Horizontal" Margin="0,5,0,25">
-                  <TextBlock Text="Enable Styling:" VerticalAlignment="Center" Width="120"/>
-                  <CheckBox x:Name="_enableStyleCheckBox" IsChecked="True" Margin="5,0,0,0" Click="UpdateWindowsStyles" />
-               </StackPanel>
-               <!--This is a custom control that modifies the underlying model. It is defined elsewhere to avoid cluttering this XAML. -->
-               <res:WindowModelEditor IsStyleEnabled="{Binding ElementName=_enableStyleCheckBox, Path=IsChecked}"/>
-            </StackPanel>
-         </GroupBox>
-
-         <DockPanel Grid.Column="1" Margin="5" >
-            <GroupBox Header="MessageBox" DockPanel.Dock="Top" Margin="5" HorizontalAlignment="Stretch">
-               <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                  <Button Content="Show System MessageBox" Click="StandardMessageBoxButton_Click" Width="150" Height="30" Margin="10"/>
-                  <Button Content="Show Toolkit MessageBox" Click="StyledMessageBoxButton_Click" Margin="10" Width="150" Height="30"/>
-               </StackPanel>
-            </GroupBox>
-            <GroupBox Header="Styleable Window" DockPanel.Dock="Top" Margin="5" HorizontalAlignment="Stretch" >
-               <Button Width="160" Height="30" Margin="10" HorizontalAlignment="Center"
-                       Content="Show" Click="OnStyleableWindow_Click" >
+    <view:WindowModel WindowBackground="#FFC72035"
+                      WindowBorderBrush="Black"
+                      WindowBorderThickness="2"
+                      WindowInactiveBackground="LightGray"
+                      WindowOpacity="0.75"
+                      WindowStyle="SingleBorderWindow"
+                      TitleForeground="Brown"
+                      TitleShadowBrush="White"
+                      TitleFontSize="15"
+                      ResizeMode="CanResize"
+                      CloseButtonVisibility="Visible"
+                      CloseButtonStyle="{StaticResource FancyButtonCloseStyle}"
+                      MinimizeButtonStyle="{StaticResource FancyButtonMinimizeStyle}"
+                      MaximizeButtonStyle="{StaticResource FancyButtonMaximizeStyle}"
+                      RestoreButtonStyle="{StaticResource FancyButtonRestoreStyle}" />
+  </local:DemoView.DataContext>
+
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
+
+    <StackPanel Orientation="Horizontal"
+                HorizontalAlignment="Stretch">
+    </StackPanel>
+
+    <Grid Grid.Row="1">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="*" />
+      </Grid.ColumnDefinitions>
+
+      <GroupBox Header="Features"
+                Margin="5"
+                VerticalAlignment="Stretch">
+        <StackPanel HorizontalAlignment="Center">
+          <StackPanel Orientation="Horizontal"
+                      Margin="0,5,0,5">
+            <TextBlock Text="Show ChildWindow:"
+                       VerticalAlignment="Center"
+                       Width="120" />
+            <CheckBox IsChecked="{Binding WindowState, ElementName=_childWindow, Converter={StaticResource windowStateBoolConv}}"
+                      Margin="5,0,0,0"
+                      VerticalAlignment="Center" />
+          </StackPanel>
+          <StackPanel Orientation="Horizontal"
+                      Margin="0,5,0,25">
+            <TextBlock Text="Enable Styling:"
+                       VerticalAlignment="Center"
+                       Width="120" />
+            <CheckBox x:Name="_enableStyleCheckBox"
+                      IsChecked="True"
+                      Margin="5,0,0,0"
+                      Click="UpdateWindowsStyles" />
+          </StackPanel>
+          <!--This is a custom control that modifies the underlying model. It is defined elsewhere to avoid cluttering this XAML. -->
+          <res:WindowModelEditor IsStyleEnabled="{Binding ElementName=_enableStyleCheckBox, Path=IsChecked}" />
+        </StackPanel>
+      </GroupBox>
+
+      <DockPanel Grid.Column="1"
+                 Margin="5">
+        <GroupBox Header="MessageBox"
+                  DockPanel.Dock="Top"
+                  Margin="5"
+                  HorizontalAlignment="Stretch">
+          <StackPanel Orientation="Horizontal"
+                      HorizontalAlignment="Center">
+            <Button Content="Show System MessageBox"
+                    Click="StandardMessageBoxButton_Click"
+                    Width="150"
+                    Height="30"
+                    Margin="10" />
+            <Button Content="Show Toolkit MessageBox"
+                    Click="StyledMessageBoxButton_Click"
+                    Margin="10"
+                    Width="150"
+                    Height="30" />
+          </StackPanel>
+        </GroupBox>
+        <GroupBox Header="Styleable Window"
+                  DockPanel.Dock="Top"
+                  Margin="5"
+                  HorizontalAlignment="Stretch">
+          <Button Width="160"
+                  Height="30"
+                  Margin="10"
+                  HorizontalAlignment="Center"
+                  Content="Show"
+                  Click="OnStyleableWindow_Click">
                   <Button.ContentTemplate>
                      <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -146,27 +195,30 @@
                         </StackPanel>
                      </DataTemplate>
                   </Button.ContentTemplate>
-               </Button>
-            </GroupBox>
-            <GroupBox Header="ChildWindow" Margin="5">
-               <Border BorderThickness="1" 
-                        BorderBrush="Black" >
-                  <xctk:WindowContainer >
-                     <xctk:ChildWindow x:Name="_childWindow" Width="325" Height="100"
-                                    Caption="Toolkit for WPF ChildWindow"
-                                    WindowStartupLocation="Center"
-                                    IsModal="True"
-                                    WindowState="Open" 
-                                    CloseButtonVisibility="{Binding CloseButtonVisibility}"
-                                    WindowStyle="{Binding WindowStyle}" >
-                        <TextBlock>
+          </Button>
+        </GroupBox>
+        <GroupBox Header="ChildWindow"
+                  Margin="5">
+          <Border BorderThickness="1"
+                  BorderBrush="Black">
+            <xctk:WindowContainer>
+              <xctk:ChildWindow x:Name="_childWindow"
+                                Width="325"
+                                Height="100"
+                                Caption="Toolkit for WPF ChildWindow"
+                                WindowStartupLocation="Center"
+                                IsModal="True"
+                                WindowState="Open"
+                                CloseButtonVisibility="{Binding CloseButtonVisibility}"
+                                WindowStyle="{Binding WindowStyle}">
+                <TextBlock>
                            This is the content of the child window.
-                        </TextBlock>
-                     </xctk:ChildWindow>
-                  </xctk:WindowContainer>
-               </Border>
-            </GroupBox>
-         </DockPanel>
-      </Grid>
-   </Grid>
+                </TextBlock>
+              </xctk:ChildWindow>
+            </xctk:WindowContainer>
+          </Border>
+        </GroupBox>
+      </DockPanel>
+    </Grid>
+  </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/SwitchPanelView.xaml.cs.txt
index f9365099..ba234ff4 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,16 +15,11 @@
 
   ************************************************************************************/
 
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System;
+using System.IO;
 using System.Windows;
+using System.Windows.Controls;
 using Xceed.Wpf.Toolkit.Panels;
-using System.Collections.Generic;
-using Xceed.Wpf.Toolkit;
-using System.Text.RegularExpressions;
-using System.IO;
-using System.Diagnostics;
 using System.Windows.Media.Imaging;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views
@@ -151,7 +146,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views
 
 
 
-    #endregion 
+    #endregion
 
     #region Methods (Private)
 
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 ce06f11f..83cbc804 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 09901d51..042efa36 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,19 +15,11 @@
 
   ************************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.IO;
+using System.Windows.Media.Imaging; // For Open Source Version
+using System.IO; // For Open Source Version
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
 {
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 cb3cc22f..4a0060c6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 a4c88df3..7131e31f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,18 +15,12 @@
 
   ************************************************************************************/
 
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using System.Windows.Controls.Primitives;
 using System;
-using System.Data;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
 {
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 dbcbe26f..f2eb24ac 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 b5dddb43..65b18290 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,17 +15,9 @@
 
   *************************************************************************************/
 
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using System.Windows.Controls.Primitives;
-using System;
 using Xceed.Wpf.Samples.SampleData;
-using System.Data;
-using System.Diagnostics;
 using System.Windows.Media;
 
 
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 de9b041c..ca281801 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 1fbade0e..28f0c915 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,13 +15,11 @@
 
   *************************************************************************************/
 
-using System.Diagnostics;
 using System.Windows;
 using System;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Documents;
-using Microsoft.Win32;
 
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
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 51db4e83..f18668c4 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 cc0e3a86..340ece9d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,17 +15,11 @@
 
   *************************************************************************************/
 
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using System.Windows.Controls.Primitives;
 using System;
 using Xceed.Wpf.Samples.SampleData;
-using System.Data;
-using System.Diagnostics;
 using System.Windows.Media;
 using System.Windows.Threading;
 
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 69146161..dace699a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 1eff0712..19e866d5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -14,19 +14,6 @@
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   *************************************************************************************/
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TimeSpan.Views
 {
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 2e681ba1..418461d1 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -29,6 +29,45 @@
     </Paragraph>
   </local:DemoView.Description>
 
+  <local:DemoView.Resources>
+    <Style TargetType="CheckBox"
+           x:Key="ShowDaysAndShowSecondsStyle">
+      <Style.Triggers>
+        <MultiDataTrigger>
+          <MultiDataTrigger.Conditions>
+            <Condition Binding="{Binding IsChecked, ElementName=_showDays}"
+                       Value="False" />
+            <Condition Binding="{Binding IsChecked, ElementName=_showHours}"
+                       Value="False" />
+          </MultiDataTrigger.Conditions>
+          <Setter Property="IsEnabled"
+                  Value="False" />
+        </MultiDataTrigger>
+      </Style.Triggers>
+    </Style>
+
+    <Style TargetType="CheckBox"
+           x:Key="ShowHoursStyle">
+      <Style.Triggers>
+        <DataTrigger Binding="{Binding IsChecked, ElementName=_showDays}"
+                     Value="True">
+          <Setter Property="IsEnabled"
+                  Value="False" />
+        </DataTrigger>
+        <MultiDataTrigger>
+          <MultiDataTrigger.Conditions>
+            <Condition Binding="{Binding IsChecked, ElementName=_showDays}"
+                       Value="False" />
+            <Condition Binding="{Binding IsChecked, ElementName=_showSeconds}"
+                       Value="False" />
+          </MultiDataTrigger.Conditions>
+          <Setter Property="IsEnabled"
+                  Value="False" />
+        </MultiDataTrigger>
+      </Style.Triggers>
+    </Style>
+  </local:DemoView.Resources>
+
   <Grid>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -45,6 +84,7 @@
           <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
           <ColumnDefinition Width="Auto" />
@@ -81,38 +121,54 @@
                   IsChecked="{Binding ShowDays, ElementName=_timeSpanUpDown}"
                   HorizontalAlignment="Left"
                   VerticalAlignment="Center"
-                  Margin="5,5,25,5" />
+                  ClickMode="Press"
+                  Margin="5,5,25,5"
+                  Style="{StaticResource ShowDaysAndShowSecondsStyle}" />
         <TextBlock Grid.Row="3"
+                   Text="ShowHours:"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_showHours"
+                  Grid.Row="3"
+                  Grid.Column="1"
+                  IsChecked="{Binding ShowHours, ElementName=_timeSpanUpDown}"
+                  HorizontalAlignment="Left"
+                  VerticalAlignment="Center"
+                  ClickMode="Press"
+                  Margin="5,5,25,5"
+                  Style="{StaticResource ShowHoursStyle}" />
+        <TextBlock Grid.Row="4"
                    Text="ShowSeconds:"
                    VerticalAlignment="Center" />
         <CheckBox x:Name="_showSeconds"
-                  Grid.Row="3"
+                  Grid.Row="4"
                   Grid.Column="1"
                   IsChecked="{Binding ShowSeconds, ElementName=_timeSpanUpDown}"
                   HorizontalAlignment="Left"
                   VerticalAlignment="Center"
-                  Margin="5,5,25,5" />
-        <TextBlock Grid.Row="4"
+                  ClickMode="Press"
+                  Margin="5,5,25,5"
+                  Style="{StaticResource ShowDaysAndShowSecondsStyle}" />
+        <TextBlock Grid.Row="5"
                    Text="FractionalSecondsDigitsCount:"
                    VerticalAlignment="Center" />
         <xctk:IntegerUpDown x:Name="_fractionalSecondsDigitsCount"
-                            Grid.Row="4"
+                            Grid.Row="5"
                             Grid.Column="1"
                             Value="{Binding FractionalSecondsDigitsCount, ElementName=_timeSpanUpDown}"
                             Maximum="3"
                             Minimum="0"
                             HorizontalAlignment="Left"
                             Margin="5,5,25,5" />
-        <TextBlock Grid.Row="5"
+        <TextBlock Grid.Row="6"
                    Text="CurrentDateTimePart:"
                    VerticalAlignment="Center" />
         <ComboBox x:Name="_currentDateTimePart"
-                  Grid.Row="5"
+                  Grid.Row="6"
                   Grid.Column="1"
                   SelectedValue="{Binding CurrentDateTimePart, ElementName=_timeSpanUpDown}"
                   SelectedValuePath="Tag"
                   Margin="5,5,25,5"
-                  ToolTip="Must match a DateTimePart of the TimeSpanUpDown" >
+                  ToolTip="Must match a DateTimePart of the TimeSpanUpDown">
           <ComboBoxItem Content="Day"
                         Tag="{x:Static xctk:DateTimePart.Day}" />
           <ComboBoxItem Content="Hour24"
@@ -196,6 +252,7 @@
                            Minimum="-5.00:00:00"
                            ClipValueToMinMax="False"
                            ShowDays="True"
+                           ShowHours="True"
                            ShowSeconds="True"
                            FractionalSecondsDigitsCount="0"
                            CurrentDateTimePart="Hour24"
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 63e016a7..01d113bc 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e9f29c4d..e51170ef 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 f5c70f98..551ea21f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,25 +15,16 @@
 
   ***********************************************************************************/
 
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Windows.Controls;
-using System;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Documents;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ToggleSwitch.Views
 {
-    /// <summary>
-    /// Interaction logic for ToggleSwitchView.xaml
-    /// </summary>
-    public partial class ToggleSwitchView : DemoView
+  /// <summary>
+  /// Interaction logic for ToggleSwitchView.xaml
+  /// </summary>
+  public partial class ToggleSwitchView : DemoView
+  {
+    public ToggleSwitchView()
     {
-        public ToggleSwitchView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/ToggleSwitchView.xaml.txt
index d753d8c8..21983fde 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 1ef04263..2b5609a4 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,21 +15,8 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using System.ComponentModel;
-using System.Data;
 using System.Collections.ObjectModel;
 
 
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 a122ab8a..b161a10c 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 99bdf9dc..c2de9dc5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,15 +15,6 @@
 
   ***********************************************************************************/
 
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Windows.Controls;
-using System;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Documents;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.WatermarkComboBox.Views
 {
   /// <summary>
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 b0b8f46f..e04f7f48 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -22,70 +22,72 @@
                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
                 Title="WatermarkComboBox">
 
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
                  FontFamily="Segoe">
-         <Run>The WatermarkComboBox is a ComboBox with a fully customizable watermark.</Run>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <DataTemplate x:Key="WatermarkComboBoxTemplate1">
-         <Grid>
-            <StackPanel Orientation="Horizontal">
-               <Image Source="..\Resources\PencilTool16.png" />
-               <TextBlock Text="{Binding}"
+      <Run>The WatermarkComboBox is a ComboBox with a fully customizable watermark.</Run>
+    </Paragraph>
+  </local:DemoView.Description>
+
+  <local:DemoView.Resources>
+    <DataTemplate x:Key="WatermarkComboBoxTemplate1">
+      <Grid>
+        <StackPanel Orientation="Horizontal">
+          <Image Source="..\Resources\PencilTool16.png" />
+          <TextBlock Text="{Binding}"
                           Foreground="Green"
                           FontFamily="Sans Serif"
                           FontWeight="Bold"
                           HorizontalAlignment="Center"
                           VerticalAlignment="Center"
                           Margin="4,0,0,0"/>
-            </StackPanel>           
-         </Grid>
-      </DataTemplate>
+        </StackPanel>
+      </Grid>
+    </DataTemplate>
 
-      <DataTemplate x:Key="WatermarkComboBoxTemplate2">
-         <Border BorderBrush="Green"
+    <DataTemplate x:Key="WatermarkComboBoxTemplate2">
+      <Border BorderBrush="Green"
                  BorderThickness="1">
-            <TextBlock Text="{Binding}"
+        <TextBlock Text="{Binding}"
                        Foreground="Red"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center" />
-         </Border>
-      </DataTemplate>
-   </local:DemoView.Resources>
+      </Border>
+    </DataTemplate>
+  </local:DemoView.Resources>
 
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
 
-      <GroupBox Header="Features"
+    <GroupBox Header="Features"
                 Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="Watermark: "
+      <Grid Margin="5">
+        <Grid.RowDefinitions>
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="*" />
+          <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <TextBlock Text="Watermark: "
                        VerticalAlignment="Center" />
-            <TextBox Grid.Column="1"
+        <TextBox Grid.Column="1"
                      HorizontalAlignment="Stretch"
                      VerticalAlignment="Center"
                      Margin="5"
                      ToolTip="Gets/Sets the watermark when there are no comboBoxItem selected and focus is not on WatermarkComboBox."
                      Text="{Binding Watermark, ElementName=_watermarkComboBox, UpdateSourceTrigger=PropertyChanged}" />
-            <TextBlock Text="WatermarkTemplate: "
+        <TextBlock Text="WatermarkTemplate: "
                        Grid.Row="1"
                        VerticalAlignment="Center" />
-            <ComboBox Grid.Column="1"
+        <ComboBox Grid.Column="1"
                       Grid.Row="1"
                       Width="150"
                       Margin="5"
@@ -93,37 +95,55 @@
                       VerticalAlignment="Center"
                       SelectedValue="{Binding WatermarkTemplate, ElementName=_watermarkComboBox}"
                       SelectedValuePath="Tag">
-               <ComboBoxItem Content="Default"
+          <ComboBoxItem Content="Default"
                              Tag="{x:Null}" />
-               <ComboBoxItem Content="Template 1"
+          <ComboBoxItem Content="Template 1"
                              Tag="{StaticResource WatermarkComboBoxTemplate1}" />
-               <ComboBoxItem Content="Template 2"
+          <ComboBoxItem Content="Template 2"
                              Tag="{StaticResource WatermarkComboBoxTemplate2}" />
-            </ComboBox>
-         </Grid>
-      </GroupBox>
+        </ComboBox>
+        <TextBlock Text="WatermarkBackgound: "
+                       Grid.Row="2"
+                       VerticalAlignment="Center" />
+        <ComboBox Grid.Column="1"
+                      Grid.Row="2"
+                      Width="150"
+                      Margin="5"
+                      HorizontalAlignment="Left"
+                      VerticalAlignment="Center"
+                      SelectedValue="{Binding WatermarkBackground, ElementName=_watermarkComboBox}"
+                      SelectedValuePath="Tag">
+          <ComboBoxItem Content="Default" Tag="{x:Null}" />
+          <ComboBoxItem Foreground="Blue" Tag="Blue" Content="Blue" />
+          <ComboBoxItem Foreground="Orange" Tag="Orange" Content="Orange" />
+          <ComboBoxItem Foreground="Green" Tag="Green" Content="Green" />
+        </ComboBox>
+
+      </Grid>
+    </GroupBox>
 
-      <StackPanel Grid.Row="1"
+    <StackPanel Grid.Row="1"
                   Margin="10">
 
-         <TextBlock Text="Usage:"
+      <TextBlock Text="Usage:"
                     Margin="10"
                     Style="{StaticResource Header}" />
 
-         <xctk:WatermarkComboBox x:Name="_watermarkComboBox"
-                                 Margin="10"
-                                 Width="350"
-                                 IsEditable="True"
-                                 Watermark="Choose a ComboBox Item..."
-                                 WatermarkTemplate="{x:Null}"
-                                 VerticalContentAlignment="Center">
-            <ComboBoxItem Content="Red" />
-            <ComboBoxItem Content="Green" />
-            <ComboBoxItem Content="Blue" />
-            <ComboBoxItem Content="Yellow" />
-            <ComboBoxItem Content="Black" />
-         </xctk:WatermarkComboBox>
-
-      </StackPanel>
-   </Grid>
+      <xctk:WatermarkComboBox x:Name="_watermarkComboBox"
+                              Margin="10"
+                              Width="350"
+                              IsEditable="True"
+                              Watermark="Choose a ComboBox Item..."
+                              WatermarkTemplate="{x:Null}"
+                              WatermarkBackground="{x:Null}"
+                              VerticalContentAlignment="Center">
+        <ComboBoxItem Content="Red" />
+        <ComboBoxItem Content="Green" />
+        <ComboBoxItem Content="Blue" />
+        <ComboBoxItem Content="Yellow" />
+        <ComboBoxItem Content="Black" />
+      </xctk:WatermarkComboBox>
+
+    </StackPanel>
+  </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WatermarkPasswordBoxView.xaml.cs.txt
index 7ba5f73b..0dd8980d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 501f8da7..fe758dfb 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 741f2378..0293053e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 2fe637c8..6c42fef1 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 2f05ab47..f3bca0c8 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,19 +16,14 @@
   ************************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
 using System.Collections.ObjectModel;
+using System.Windows;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 {
   public enum GenderData
   {
-    Male = 0, 
+    Male = 0,
     Female
   }
 
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 5edab9fe..d9b33db3 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,146 +15,223 @@
 
   ************************************************************************************-->
 <local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views.WindowContainerView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 xmlns:xctkconv="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
-                 xmlns:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views"
-                 Title="WindowContainer">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14" FontFamily="Segoe">
-         <Run>WindowContainer can be used to provide an area where a window-like control can be displayed. This is particularly useful in an XBAP application, where windows can't be popped up.</Run>
-         <LineBreak/>
-         <LineBreak />         
-         <Run>ChildWindow or MessageBox controls can be added and constrained in a WindowContainer. When a child of the WindowContainer is modal (modal ChildWindow or MessageBox), the background color of the WindowContainer can be set.</Run>
-         <LineBreak/>
-         <LineBreak />
-         <Run>In WindowContainer, the modal windows (modal ChildWindow or MesssageBox) will always be in front, preventing the use of other windows from the WindowContainer.</Run>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-        <xctkconv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-        <conv:WindowStateToBoolConverter x:Key="WindowStateToBoolConverter" />
-
-        <ObjectDataProvider x:Key="GenderEnum" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="sample:GenderData" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-    </local:DemoView.Resources>
-
-    <Grid>
-        <Grid.RowDefinitions>
-             <RowDefinition Height="Auto" />
-             <RowDefinition Height="*" />
-       </Grid.RowDefinitions>
-
-       <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="ModalBackgroundBrush:" VerticalAlignment="Center" />
-            <xctk:ColorPicker x:Name="_modalBackgroundColorPicker" Grid.Column="1" SelectedColor="{Binding ModalBackgroundBrush, ElementName=_windowContainer, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
-         </Grid>
-      </GroupBox>
-
-       <Grid Grid.Row="1" Margin="10"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                xmlns:xctkconv="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
+                xmlns:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views"
+                Title="WindowContainer">
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      <Run>WindowContainer can be used to provide an area where a window-like control can be displayed. This is particularly useful in an XBAP application, where windows can't be popped up.</Run>
+      <LineBreak />
+      <LineBreak />
+      <Run>ChildWindow or MessageBox controls can be added and constrained in a WindowContainer. When a child of the WindowContainer is modal (modal ChildWindow or MessageBox), the background color of the WindowContainer can be set.</Run>
+      <LineBreak />
+      <LineBreak />
+      <Run>In WindowContainer, the modal windows (modal ChildWindow or MesssageBox) will always be in front, preventing the use of other windows from the WindowContainer.</Run>
+    </Paragraph>
+  </local:DemoView.Description>
+
+  <local:DemoView.Resources>
+    <xctkconv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
+    <conv:WindowStateToBoolConverter x:Key="WindowStateToBoolConverter" />
+
+    <ObjectDataProvider x:Key="GenderEnum"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="sample:GenderData" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+  </local:DemoView.Resources>
+
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
+
+    <GroupBox Header="Features"
+              Grid.Row="0"
+              Margin="5">
+      <Grid Margin="5">
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <TextBlock Text="ModalBackgroundBrush:"
+                   VerticalAlignment="Center" />
+        <xctk:ColorPicker x:Name="_modalBackgroundColorPicker"
+                          Grid.Column="1"
+                          SelectedColor="{Binding ModalBackgroundBrush, ElementName=_windowContainer, Converter={StaticResource SolidColorBrushToColorConverter}}"
+                          Width="100"
+                          HorizontalAlignment="Left"
+                          VerticalAlignment="Center"
+                          Margin="5" />
+      </Grid>
+    </GroupBox>
+
+    <Grid Grid.Row="1"
+          Margin="10"
           TextElement.Foreground="{DynamicResource {x:Static SystemColors.ActiveCaptionTextBrushKey}}">
-           <Grid.RowDefinitions>
-             <RowDefinition Height="Auto" />
-             <RowDefinition Height="*" />
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="Usage:"
+                 Style="{StaticResource Header}" />
+
+      <Grid Grid.Row="1">
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <StackPanel>
+          <CheckBox x:Name="_childWindowCheckBox"
+                    Content="Child Window"
+                    Margin="5"
+                    IsChecked="{Binding WindowState, ElementName=_childWindow, Converter={StaticResource WindowStateToBoolConverter}}" />
+          <CheckBox x:Name="_modalChildWindowCheckBox"
+                    Content="Modal Child Window"
+                    Margin="5"
+                    IsChecked="{Binding WindowState, ElementName=_modalChildWindow, Converter={StaticResource WindowStateToBoolConverter}}" />
+          <CheckBox x:Name="_messageBoxCheckBox"
+                    Content="MessageBox"
+                    Margin="5"
+                    Checked="OnMessageBoxCheckBoxChecked"
+                    Unchecked="OnMessageBoxCheckBoxUnchecked" />
+        </StackPanel>
+
+        <Grid Column="1">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="80" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="80" />
+            <ColumnDefinition />
+          </Grid.ColumnDefinitions>
+          <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
           </Grid.RowDefinitions>
 
-          <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-
-          <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-
-            <StackPanel>
-                <CheckBox x:Name="_childWindowCheckBox" Content="Child Window" Margin="5" IsChecked="{Binding WindowState, ElementName=_childWindow, Converter={StaticResource WindowStateToBoolConverter}}" />
-                <CheckBox x:Name="_modalChildWindowCheckBox" Content="Modal Child Window" Margin="5" IsChecked="{Binding WindowState, ElementName=_modalChildWindow, Converter={StaticResource WindowStateToBoolConverter}}" />
-                <CheckBox x:Name="_messageBoxCheckBox" Content="MessageBox" Margin="5" Checked="OnMessageBoxCheckBoxChecked" Unchecked="OnMessageBoxCheckBoxUnchecked" />
-            </StackPanel>
-
-            <Grid Column="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80" />
-                    <ColumnDefinition />
-                    <ColumnDefinition Width="80" />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition />
-                    <RowDefinition />
-                </Grid.RowDefinitions>
-
-                <!--1st Column -->
-                <TextBlock Text="First Name:" VerticalAlignment="Center" Margin="10"/>
-                <TextBox Grid.Column="1" Text="Michael" Width="150" Height="30" HorizontalAlignment="Left"/>
-                <TextBlock Grid.Row="1" Text="Last Name:" VerticalAlignment="Center" Margin="10"/>
-                <TextBox Grid.Row="1" Grid.Column="1" Width="150" Height="30" Text="Thompson" HorizontalAlignment="Left"/>
-                <TextBlock Grid.Row="2" Text="Address:" VerticalAlignment="Center" Margin="10"/>
-                <TextBox Grid.Row="2" Grid.Column="1" Width="150" Height="30" Text="65 Main street" HorizontalAlignment="Left"/>
-
-                <!-- 2nd Column-->
-                <TextBlock Grid.Column="2" Text="Gender:" VerticalAlignment="Center" Margin="10"/>
-                <ComboBox Grid.Column="3" Width="100" Height="30" ItemsSource="{Binding Source={StaticResource GenderEnum}}" SelectedIndex="0" Margin="5" HorizontalAlignment="Left"/>
-                <TextBlock Grid.Row="1" Grid.Column="2" Text="Job Title:" VerticalAlignment="Center" Margin="10"/>
-                <TextBox Grid.Row="1" Grid.Column="3" Width="100"  Height="30"  Text="Plumber" Margin="5" HorizontalAlignment="Left"/>
-                <TextBlock Grid.Row="2" Grid.Column="2" Text="Salary:" VerticalAlignment="Center" Margin="10"/>
-                <xctk:IntegerUpDown Grid.Row="2" Width="100" Grid.Column="3" Height="30" Value="30000" Increment="5000" Margin="5" HorizontalAlignment="Left"/>
-            </Grid>
-
-            <Border Grid.Column="1"
-                    BorderBrush="Black"
-                    BorderThickness="2"
-                    Margin="5,0,0,0">
-
-               <xctk:WindowContainer x:Name="_windowContainer" 
-                                     ModalBackgroundBrush="#80000000">
-                  <xctk:ChildWindow x:Name="_childWindow" 
-                                  Caption="Modaless ChildWindow"
-                                  Left="75"
-                                  Top="50"
-                                  Width="275"
-                                  Height="125"
-                                  WindowState="Open">
-                        <TextBlock Text="This is a regular Child Window" Padding="10"/>
-                </xctk:ChildWindow>
-
-                  <xctk:ChildWindow x:Name="_modalChildWindow" 
-                                  Caption="Modal ChildWindow"
-                                  IsModal="True"
-                                  Left="175"
-                                  Top="125"
-                                  Width="275"
-                                  Height="125"
-                                  WindowState="Open">
-                        <TextBlock Text="This is a modal Child Window" Padding="10"/>
-                </xctk:ChildWindow>
-
-                  <xctk:MessageBox x:Name="_messageBox"
-                                 Caption="MessageBox" 
-                                 Text="This is a MessageBox, always modal"
-                                 Closed="OnMessageBoxClose" />
-               </xctk:WindowContainer>
-
-            </Border>
+          <!--1st Column -->
+          <TextBlock Text="First Name:"
+                     VerticalAlignment="Center"
+                     Margin="10" />
+          <TextBox Grid.Column="1"
+                   Text="Michael"
+                   Width="150"
+                   Height="30"
+                   HorizontalAlignment="Left" />
+          <TextBlock Grid.Row="1"
+                     Text="Last Name:"
+                     VerticalAlignment="Center"
+                     Margin="10" />
+          <TextBox Grid.Row="1"
+                   Grid.Column="1"
+                   Width="150"
+                   Height="30"
+                   Text="Thompson"
+                   HorizontalAlignment="Left" />
+          <TextBlock Grid.Row="2"
+                     Text="Address:"
+                     VerticalAlignment="Center"
+                     Margin="10" />
+          <TextBox Grid.Row="2"
+                   Grid.Column="1"
+                   Width="150"
+                   Height="30"
+                   Text="65 Main street"
+                   HorizontalAlignment="Left" />
+
+          <!-- 2nd Column-->
+          <TextBlock Grid.Column="2"
+                     Text="Gender:"
+                     VerticalAlignment="Center"
+                     Margin="10" />
+          <ComboBox Grid.Column="3"
+                    Width="100"
+                    Height="30"
+                    ItemsSource="{Binding Source={StaticResource GenderEnum}}"
+                    SelectedIndex="0"
+                    Margin="5"
+                    HorizontalAlignment="Left" />
+          <TextBlock Grid.Row="1"
+                     Grid.Column="2"
+                     Text="Job Title:"
+                     VerticalAlignment="Center"
+                     Margin="10" />
+          <TextBox Grid.Row="1"
+                   Grid.Column="3"
+                   Width="100"
+                   Height="30"
+                   Text="Plumber"
+                   Margin="5"
+                   HorizontalAlignment="Left" />
+          <TextBlock Grid.Row="2"
+                     Grid.Column="2"
+                     Text="Salary:"
+                     VerticalAlignment="Center"
+                     Margin="10" />
+          <xctk:IntegerUpDown Grid.Row="2"
+                              Width="100"
+                              Grid.Column="3"
+                              Height="30"
+                              Value="30000"
+                              Increment="5000"
+                              Margin="5"
+                              HorizontalAlignment="Left" />
         </Grid>
+
+        <Border Grid.Column="1"
+                BorderBrush="Black"
+                BorderThickness="2"
+                Margin="5,0,0,0">
+
+          <xctk:WindowContainer x:Name="_windowContainer"
+                                ModalBackgroundBrush="#80000000">
+            <xctk:ChildWindow x:Name="_childWindow"
+                              Caption="Modaless ChildWindow"
+                              Left="75"
+                              Top="50"
+                              Width="275"
+                              Height="125"
+                              WindowState="Open">
+              <TextBlock Text="This is a regular Child Window"
+                         Padding="10" />
+            </xctk:ChildWindow>
+
+            <xctk:ChildWindow x:Name="_modalChildWindow"
+                              Caption="Modal ChildWindow"
+                              IsModal="True"
+                              Left="175"
+                              Top="125"
+                              Width="275"
+                              Height="125"
+                              WindowState="Open">
+              <TextBlock Text="This is a modal Child Window"
+                         Padding="10" />
+            </xctk:ChildWindow>
+
+            <xctk:MessageBox x:Name="_messageBox"
+                             Caption="MessageBox"
+                             Text="This is a MessageBox, always modal"
+                             Closed="OnMessageBoxClose" />
+          </xctk:WindowContainer>
+
+        </Border>
       </Grid>
     </Grid>
+  </Grid>
 
 </local:DemoView>
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.cs.txt b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/CodeFiles/WizardView.xaml.cs.txt
index a24cfab5..1671ae31 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,7 +15,6 @@
 
   *************************************************************************************/
 
-using System.Windows;
 using System;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Wizard.Views
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 28ec6a48..7b79049a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 c59b2fc6..aeefc099 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,8 @@
 
   *************************************************************************************/
 
-using System.Windows.Controls;
-using System.Windows.Data;
-using System;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Views
 {
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 6bfbbc55..a2cb6828 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CSharpFormatter.cs
index b6361e32..d1ce37fa 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,7 +17,6 @@
 
 using System.Windows.Documents;
 using Xceed.Wpf.Toolkit.LiveExplorer.Core.CodeFormatting;
-using Xceed.Wpf.Toolkit;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Core
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs
index 5b183532..b8a08e58 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/CodeFormatting/XamlFormat.cs
@@ -149,12 +149,12 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Core.CodeFormatting
         return TokenizeElementWhitespace();
       else
         if( StartsWith( "/>" ) )
-          return TokenizeSimple( "/>", XmlTokenKind.SelfClose, XmlTokenizerMode.OutsideElement );
-        else
+        return TokenizeSimple( "/>", XmlTokenKind.SelfClose, XmlTokenizerMode.OutsideElement );
+      else
           if( StartsWith( ">" ) )
-            return TokenizeSimple( ">", XmlTokenKind.Close, XmlTokenizerMode.OutsideElement );
-          else
-            return TokenizeName( XmlTokenKind.AttributeName, XmlTokenizerMode.AfterAttributeName );
+        return TokenizeSimple( ">", XmlTokenKind.Close, XmlTokenizerMode.OutsideElement );
+      else
+        return TokenizeName( XmlTokenKind.AttributeName, XmlTokenizerMode.AfterAttributeName );
     }
     private XmlToken TokenizeText()
     {
@@ -198,15 +198,15 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Core.CodeFormatting
         return TokenizeSimple( "<!--", XmlTokenKind.CommentBegin, XmlTokenizerMode.InsideComment );
       else
         if( StartsWith( "<![CDATA[" ) )
-          return TokenizeSimple( "<![CDATA[", XmlTokenKind.CDataBegin, XmlTokenizerMode.InsideCData );
-        else
+        return TokenizeSimple( "<![CDATA[", XmlTokenKind.CDataBegin, XmlTokenizerMode.InsideCData );
+      else
           if( StartsWith( "<?" ) )
-            return TokenizeSimple( "<?", XmlTokenKind.OpenProcessingInstruction, XmlTokenizerMode.InsideProcessingInstruction );
-          else
+        return TokenizeSimple( "<?", XmlTokenKind.OpenProcessingInstruction, XmlTokenizerMode.InsideProcessingInstruction );
+      else
             if( StartsWith( "</" ) )
-              return TokenizeSimple( "</", XmlTokenKind.OpenClose, XmlTokenizerMode.AfterOpen );
-            else
-              return TokenizeSimple( "<", XmlTokenKind.Open, XmlTokenizerMode.AfterOpen );
+        return TokenizeSimple( "</", XmlTokenKind.OpenClose, XmlTokenizerMode.AfterOpen );
+      else
+        return TokenizeSimple( "<", XmlTokenKind.Open, XmlTokenizerMode.AfterOpen );
     }
     private XmlToken TokenizeEntity()
     {
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 c2912aa4..2a8f545f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/LiveExplorerTreeViewItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/LiveExplorerTreeViewItem.cs
index 745d9a56..e959dece 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,8 @@
 
   ***********************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Core
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/XamlFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Core/XamlFormatter.cs
index 50b30e72..2344521b 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -19,7 +19,6 @@ using System.Collections.Generic;
 using System.Windows.Documents;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.LiveExplorer.Core.CodeFormatting;
-using Xceed.Wpf.Toolkit;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Core
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/DemoView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/DemoView.cs
index f9d97d43..72dab642 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,14 +15,11 @@
 
   ***********************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
-using System.Windows;
+using System.Diagnostics;
 using System.IO;
+using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Documents;
-using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml
index 4b37054d..00a3d5af 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/HomeView.xaml.cs
index e4f2469a..a8d5b31a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -14,19 +14,6 @@
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   ***********************************************************************************/
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml
index 05c6c764..e89fb694 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/MainWindow.xaml.cs
index 1c7cc130..f43ba68b 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,23 +15,12 @@
 
   ***********************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Diagnostics;
+using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Globalization;
-using System.Reflection;
-using Xceed.Wpf.Toolkit.LiveExplorer;
 using Xceed.Wpf.Toolkit.LiveExplorer.Core;
-using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer
 {
@@ -41,13 +30,25 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer
   public partial class MainWindow : Window
   {
     private const string toolkitAssembly =
-       "Xceed.Wpf.Toolkit.LiveExplorer"
+#if NETCORE
+        "Xceed.Wpf.Toolkit.LiveExplorer.NETCore"
+#elif NET5
+        "Xceed.Wpf.Toolkit.LiveExplorer.NET5"
+#else
+        "Xceed.Wpf.Toolkit.LiveExplorer"
+#endif
       ;
 
     public MainWindow()
     {
       InitializeComponent();
-       this.Title = "Toolkit Plus for WPF - LiveExplorer";
+#if NETCORE
+        this.Title = "Toolkit Plus for WPF .NET Core - LiveExplorer";
+#elif NET5
+        this.Title = "Toolkit Plus for WPF .NET 5 - LiveExplorer";
+#else
+      this.Title = "Toolkit Plus for WPF - LiveExplorer";
+#endif
 
       this.Loaded += new RoutedEventHandler( this.MainWindow_Loaded );
 
@@ -56,9 +57,9 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer
     }
 
 
-#region Properties
+    #region Properties
 
-#region View
+    #region View
 
     public static readonly DependencyProperty ViewProperty = DependencyProperty.Register( "View", typeof( DemoView ), typeof( MainWindow ), new UIPropertyMetadata( null, OnViewChanged ) );
     public DemoView View
@@ -85,11 +86,11 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer
       this.InitView();
     }
 
-#endregion //View
+    #endregion //View
 
-#endregion //Properties
+    #endregion //Properties
 
-#region Event Handler
+    #region Event Handler
 
     void MainWindow_Loaded( object sender, RoutedEventArgs e )
     {
@@ -131,13 +132,13 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer
       //
     }
 
-#endregion //EventHandler
+    #endregion //EventHandler
 
-#region Methods
+    #region Methods
 
     private void InitView()
     {
-      if( ( _flowDocumentDesc != null ) && ( this.View != null) )
+      if( ( _flowDocumentDesc != null ) && ( this.View != null ) )
       {
         _flowDocumentDesc.Blocks.Clear();
         if( this.View.Description != null )
@@ -151,7 +152,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer
       }
     }
 
-#endregion
+    #endregion
 
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
index 77fabb3a..4be77d2c 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-2021" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2022" )]
 [assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
@@ -49,10 +49,14 @@ 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( "4.3" )]
+[assembly: AssemblyVersion( "4.4" )]
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
+#if NETCORE || NET5
+[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )]
+#else
 [assembly: AssemblyKeyFile( @"..\..\..\sn.snk" )]
+#endif
 [assembly: AssemblyKeyName( "" )]
 #pragma warning restore 1699
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/LiveExplorerScrollViewer.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/LiveExplorerScrollViewer.xaml
index 2d8011b2..8852e04d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/TextBlockStyles.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Resources/TextBlockStyles.xaml
index 197d409a..d24092b2 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/Document.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/Document.cs
index af4a4d1f..8ba01102 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/Document.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/Document.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,6 @@
 
   ************************************************************************************/
 
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Resources
 {
   public class Document : DocumentBase
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/DocumentBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/DocumentBase.cs
index 8864ad6e..2a9501c6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/DocumentBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/DocumentBase.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Resources
+namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Resources
 {
   public class DocumentBase
   {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/DocumentView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/DocumentView.xaml
index 5582edf4..a27042ae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/DocumentView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/DocumentView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/DocumentView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/DocumentView.xaml.cs
index 0e770f5e..caafa1cf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/DocumentView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/DocumentView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/Note.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/Note.cs
index bef0cfb2..4742c105 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/Note.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/Note.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,6 @@
 
   ************************************************************************************/
 
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Resources
 {
   public class Note : DocumentBase
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/NoteView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/NoteView.xaml
index 01e3e289..e677a731 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/NoteView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/NoteView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/NoteView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/NoteView.xaml.cs
index 7086b941..10e72a05 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/NoteView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/NoteView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/Page.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/Page.cs
index 01e95b5e..8939562d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/Page.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/Page.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,6 @@
 
   ************************************************************************************/
 
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Resources
 {
   public class Page : DocumentBase
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/PageView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/PageView.xaml
index bbac7b44..ea9e0842 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/PageView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/PageView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/PageView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/PageView.xaml.cs
index b97923cd..e98f7294 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/PageView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Resources/PageView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockPropertiesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockPropertiesView.xaml
index 862f5841..8dafee6d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockPropertiesView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockPropertiesView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockPropertiesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockPropertiesView.xaml.cs
index 7c736fd7..8a10b2a0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockPropertiesView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockPropertiesView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockSourcesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockSourcesView.xaml
index 6b82d0ca..e6587e1e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockSourcesView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockSourcesView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockSourcesView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockSourcesView.xaml.cs
index ebe6e433..f248e64c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockSourcesView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/AvalonDock/Views/AvalonDockSourcesView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 62367e18..842d24a6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 da375176..da24fa46 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,9 @@
 
   ************************************************************************************/
 
+using System.IO;
 using System.Windows;
 using Xceed.Wpf.AvalonDock.Layout.Serialization;
-using System.IO;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.AvalonDock.Views
 {
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 62fe3fe9..f249bbfe 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   ************************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Converters
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 19f47243..b34e213a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 448f1203..a69553bf 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 47fa3623..87ad8f73 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 4addac8f..f4ec69a6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 62f53c89..e8dee1f0 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 cab14c13..a8360590 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 5c7f182a..92217edd 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -20,7 +20,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.BusyIndicator.Views
   /// <summary>
   /// Interaction logic for BusyIndicatorView.xaml
   /// </summary>
-  public partial class BusyIndicatorView: DemoView
+  public partial class BusyIndicatorView : DemoView
   {
     public BusyIndicatorView()
     {
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 39df4389..5abd12e9 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 a6df3658..55aeee37 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,7 +17,6 @@
 
 using System;
 using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views
 {
@@ -33,7 +32,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Button.Views
 
     private void ButtonSpinner_Spin( object sender, SpinEventArgs e )
     {
-      String[] names = (String[])this.Resources[ "names" ];
+      String[] names = ( String[] )this.Resources[ "names" ];
 
       ButtonSpinner spinner = ( ButtonSpinner )sender;
       TextBox txtBox = ( TextBox )spinner.Content;
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 69887d7e..2e364859 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 4eab1944..87f6aa7c 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 4d7b6987..6aa668ae 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 3615e051..56b2c82e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 a660323b..ec9bb212 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 fd61804d..161fa923 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 69375c4a..4b8564db 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   *************************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Data;
 using System.Globalization;
 using System.Windows;
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 0c42b972..3d214909 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 a81861c4..79f0ad6f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,7 @@
 
   ************************************************************************************/
 
-using System.Windows.Media;
 using System.Windows.Controls;
-using System;
-using System.Diagnostics;
 using System.Windows;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
@@ -51,9 +48,12 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 
 
 
+
+
     #region Implementation
 
 
     #endregion
+
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Chart/Views/ChartLegendView.xaml
index 55ae2f55..79dd07a2 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 6518b652..38ecbafa 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,6 @@
 
   **************************************************************************************/
 
-using System.Windows.Media;
-using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
   /// <summary>
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 08308b98..aa2ce4ae 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7c9bc0a8..6842dc01 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,9 +17,6 @@
 
 using System.Windows.Media;
 using System.Windows;
-using Xceed.Wpf.Toolkit.Panels;
-using System;
-using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
   /// <summary>
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 5b20a789..ab366150 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 722cf830..fe170bad 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   ************************************************************************************/
 
-using System.Windows.Media;
-using System;
-using System.Collections.ObjectModel;
-using System.Collections.Generic;
-using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
   /// <summary>
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 30fe5437..964875d5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 be607a63..e0ac38e1 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   ************************************************************************************/
 
-using System.Windows.Media;
-using System.Windows.Controls;
-using System;
-using System.Windows;
-using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
   /// <summary>
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 680a88cb..5f3ec26a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 5811dd25..4131e26d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   *************************************************************************************/
 
-using System.Windows.Media;
-using System.Windows.Controls;
-using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
   /// <summary>
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 34842933..bb74e164 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 d40e2135..921fb3b4 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,8 @@
 
   *************************************************************************************/
 
-using System.Windows.Media;
-using System.Windows.Controls;
 using System.Windows;
 using System;
-using System.Diagnostics;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
   /// <summary>
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 028908dd..3839e1a8 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e11f8332..cc1d309e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,12 +15,6 @@
 
   *************************************************************************************/
 
-using System.Windows.Media;
-using System.Windows.Controls;
-using System;
-using System.Windows.Media.Imaging;
-using System.Windows;
-using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Chart.Views
 {
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 418688e2..035c0de1 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7536f13c..63243955 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,7 +16,6 @@
   *************************************************************************************/
 
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views
@@ -108,7 +107,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.CheckLists.Views
     {
       get
       {
-        string completeName = string.Format("{0} {1}", FirstName, LastName).PadRight(20);
+        string completeName = string.Format( "{0} {1}", FirstName, LastName ).PadRight( 20 );
         return string.Format(
           "ID={0}: Name= {1}, IsSelected= {2}",
           ID,
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 f1bbf7ee..793d6e3f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 105a0b6c..e2f915a8 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,6 @@
 
   ***********************************************************************************/
 
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Color.Views
 {
   /// <summary>
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 eb128f32..2fdd2bb0 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,10 @@
 
   ***********************************************************************************/
 using System;
-using System.Windows.Data;
-using Xceed.Wpf.Samples.SampleData;
 using System.Globalization;
 using System.Windows;
+using System.Windows.Data;
+using Xceed.Wpf.Samples.SampleData;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DataGrid.Converters
 {
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 838c9782..4fbdb11d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 11e34778..ea8736f6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e3de1ca4..eea49bb4 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 883a275a..5f5e3103 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,6 @@
 
   *************************************************************************************/
 
-using System.Data;
-using System.Diagnostics;
 using System.Windows.Controls;
 using System.Windows.Data;
 using Xceed.Wpf.Samples.SampleData;
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 a718b020..73d824d7 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,11 +16,8 @@
   ************************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Globalization;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters
 {
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 65cf588b..67ea82ca 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,11 +16,8 @@
   ************************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Globalization;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters
 {
@@ -30,7 +27,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters
     {
       if( value is System.DateTime )
       {
-        System.DateTime time = (System.DateTime)value;
+        System.DateTime time = ( System.DateTime )value;
         return new System.TimeSpan( time.Hour, time.Minute, 0 );
       }
       return value;
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 0db5e030..eb8dc98a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,191 +16,433 @@
   ***********************************************************************************-->
 
 <local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Views.DateTimeView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters"
-                 Title="DateTime">
-    <local:DemoView.Description>
-        <Paragraph FontSize="14" FontFamily="Segoe">
-            The DateTimePicker and TimePicker controls let you select the date and the time in several ways. The TimePicker is used in the DateTimePicker.
-        </Paragraph>
-    </local:DemoView.Description>
-
-    <local:DemoView.Resources>
-      <conv:DateTimeToTimeSpanConverter x:Key="dateTimeToTimeSpanConverter" />
-      <conv:CustomFormatToBoolConverter x:Key="CustomFormatToBoolConverter" />
-
-      <ObjectDataProvider x:Key="enumDateFormatData" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:DateTimeFormat"/>
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-        <ObjectDataProvider x:Key="enumVisibility" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="Visibility" />
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-       <ObjectDataProvider x:Key="enumKind" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="sys:DateTimeKind" />
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-      <ObjectDataProvider x:Key="enumCalendarDisplayMode"
-                          MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="CalendarMode" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-      <ObjectDataProvider x:Key="enumDateTimePart" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="xctk:DateTimePart"/>
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-   </local:DemoView.Resources>
-    <Grid>
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Converters"
+                Title="DateTime">
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      The DateTimePicker and TimePicker controls let you select the date and the time in several ways. The TimePicker is used in the DateTimePicker.
+    </Paragraph>
+  </local:DemoView.Description>
+
+  <local:DemoView.Resources>
+    <conv:DateTimeToTimeSpanConverter x:Key="dateTimeToTimeSpanConverter" />
+    <conv:CustomFormatToBoolConverter x:Key="CustomFormatToBoolConverter" />
+
+    <ObjectDataProvider x:Key="enumDateFormatData"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="xctk:DateTimeFormat" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+    <ObjectDataProvider x:Key="enumVisibility"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="Visibility" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+    <ObjectDataProvider x:Key="enumKind"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="sys:DateTimeKind" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+    <ObjectDataProvider x:Key="enumCalendarDisplayMode"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="CalendarMode" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+    <ObjectDataProvider x:Key="enumDateTimePart"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="xctk:DateTimePart" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+  </local:DemoView.Resources>
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="Auto" />
+    </Grid.RowDefinitions>
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition Width="*" />
+      <ColumnDefinition Width="*" />
+    </Grid.ColumnDefinitions>
+
+    <GroupBox Header="Features"
+              Grid.ColumnSpan="2"
+              HorizontalAlignment="Stretch">
+      <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="*"/>
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
-      <GroupBox Header="Features" Grid.ColumnSpan="2" HorizontalAlignment="Stretch" >
-         <Grid>
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-               <ColumnDefinition Width="Auto"/>
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="Format:" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center" />
-            <ComboBox x:Name="_format" Grid.Row="0" Grid.Column="1" SelectedIndex="1" ItemsSource="{Binding Source={StaticResource enumDateFormatData}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="FormatString:" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_formatString}" Style="{StaticResource DisableGrayText}" />
-            <TextBox x:Name="_formatString" Grid.Row="1" Grid.Column="1" Text="yy MMM dd" Width="190" IsEnabled="{Binding Source={x:Reference _format}, Path=SelectedItem, Converter={StaticResource CustomFormatToBoolConverter}}" Margin="5,5,25,5"/>
-            <TextBlock Text="Watermark:" Grid.Row="2" Grid.Column="0" VerticalAlignment="Center"/>
-            <TextBox x:Name="_watermark" Grid.Row="2" Grid.Column="1" Text="Enter Text" Width="190" VerticalAlignment="Center" Margin="5,5,25,5"/>  
-            <TextBlock Text="AutoCloseCalendar:" Grid.Row="3" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_autoCloseCalendar" Grid.Row="3" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5,5,25,5"/>    
-            <TextBlock Text="ClipValueToMinMax:" Grid.Row="4" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_clipValueToMinMax" Grid.Row="4" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5,5,25,5"/>
-            <TextBlock Text="Kind:" Grid.Row="5" Grid.Column="0" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_kind" Grid.Row="5" Grid.Column="1" SelectedIndex="2" ItemsSource="{Binding Source={StaticResource enumKind}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="CalendarDisplayMode:" Grid.Row="6" Grid.Column="0" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_calendarDisplayMode" Grid.Row="6" Grid.Column="1" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumCalendarDisplayMode}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="CalendarWidth:" Grid.Row="7" Grid.Column="0" VerticalAlignment="Center"/>
-            <xctk:DoubleUpDown x:Name="_calendarWidth" Grid.Row="7" Grid.Column="1" Value="178" Minimum="100" Maximum="500" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="ShowDropDownButton:" Grid.Row="8" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_showDropDownButton" Grid.Row="8" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5,5,25,5"/>
-            <TextBlock Text="TimePickerVisibility:" Grid.Row="9" Grid.Column="0" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_timePickerVisibility" Grid.Row="9" Grid.Column="1" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumVisibility}}" Width="190" Margin="5,5,25,5"/>
-            <TextBlock Text="TimePickerShowButtonSpinner:" Grid.Row="10" Grid.Column="0" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_timePickerShowButtonSpinner" Grid.Row="10" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5,5,25,5"/>
-
-            <TextBlock Text="TimeFormat:" Grid.Row="0" Grid.Column="2" VerticalAlignment="Center" />
-            <ComboBox x:Name="_timeFormat" Grid.Row="0" Grid.Column="3" SelectedIndex="7" ItemsSource="{Binding Source={StaticResource enumDateFormatData}}" Width="190" Margin="5"/>
-            <TextBlock Text="Time FormatString:" Grid.Row="1" Grid.Column="2" VerticalAlignment="Center" IsEnabled="{Binding IsEnabled, ElementName=_timeFormatString}" Style="{StaticResource DisableGrayText}"/>
-            <TextBox x:Name="_timeFormatString" Grid.Row="1" Grid.Column="3" Text="H:mm" Width="190"  IsEnabled="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem, Converter={StaticResource CustomFormatToBoolConverter}}" Margin="5"/>            
-            <TextBlock Text="TimeWatermark:" Grid.Row="2" Grid.Column="2" VerticalAlignment="Center"/>
-            <TextBox x:Name="_timeWatermark" Grid.Row="2" Grid.Column="3" Text="Enter Text" Width="190" VerticalAlignment="Center" Margin="5"/>
-            <TextBlock Text="Minimum:" Grid.Row="3" Grid.Column="2" VerticalAlignment="Center"/>
-            <xctk:DateTimeUpDown x:Name="_minimum" Grid.Row="3" Grid.Column="3" Format="Custom" FormatString="yyyy/MM/dd HH:mm" Value="2016/01/01T12:00" Width="190" VerticalAlignment="Center" Margin="5"/>
-            <TextBlock Text="Maximum:" Grid.Row="4" Grid.Column="2" VerticalAlignment="Center"/>
-            <xctk:DateTimeUpDown x:Name="_maximum" Grid.Row="4" Grid.Column="3" Format="Custom" FormatString="yyyy/MM/dd HH:mm" Value="2022/12/31T12:00" Width="190" VerticalAlignment="Center" Margin="5"/>
-            <TextBlock Text="CurrentDateTimePart:" Grid.Row="5" Grid.Column="2" VerticalAlignment="Center"/>
-            <ComboBox x:Name="_currentDateTimePart" Grid.Row="5" Grid.Column="3" SelectedIndex="0" ItemsSource="{Binding Source={StaticResource enumDateTimePart}}" Width="190" Margin="5" ToolTip="Must match a DateTimePart of the DateTimePicker Format."/>
-            <TextBlock Text="Auto Clip time Parts:" Grid.Row="6" Grid.Column="2" VerticalAlignment="Center"/>
-            <CheckBox x:Name="_autoClipTimeParts" Grid.Row="6" Grid.Column="3" IsChecked="False" VerticalAlignment="Center" Margin="5,5,25,5"/>
-         </Grid>
+        <TextBlock Text="Format:"
+                   Grid.Row="0"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_format"
+                  Grid.Row="0"
+                  Grid.Column="1"
+                  SelectedIndex="1"
+                  ItemsSource="{Binding Source={StaticResource enumDateFormatData}}"
+                  Width="185"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="FormatString:"
+                   Grid.Row="1"
+                   Grid.Column="0"
+                   VerticalAlignment="Center"
+                   IsEnabled="{Binding IsEnabled, ElementName=_formatString}"
+                   Style="{StaticResource DisableGrayText}" />
+        <TextBox x:Name="_formatString"
+                 Grid.Row="1"
+                 Grid.Column="1"
+                 Text="yy MMM dd"
+                 Width="185"
+                 IsEnabled="{Binding Source={x:Reference _format}, Path=SelectedItem, Converter={StaticResource CustomFormatToBoolConverter}}"
+                 Margin="5,5,25,5" />
+        <TextBlock Text="Watermark:"
+                   Grid.Row="2"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <TextBox x:Name="_watermark"
+                 Grid.Row="2"
+                 Grid.Column="1"
+                 Text="Enter Text"
+                 Width="185"
+                 VerticalAlignment="Center"
+                 Margin="5,5,25,5" />
+        <TextBlock Text="AutoCloseCalendar:"
+                   Grid.Row="3"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_autoCloseCalendar"
+                  Grid.Row="3"
+                  Grid.Column="1"
+                  IsChecked="False"
+                  VerticalAlignment="Center"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="AutoCloseCalendarOnTimeSelection:"
+                   Grid.Row="4"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_autoCloseCalendarOnTimeSelection"
+                  Grid.Row="4"
+                  Grid.Column="1"
+                  IsChecked="False"
+                  VerticalAlignment="Center"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="ClipValueToMinMax:"
+                   Grid.Row="5"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_clipValueToMinMax"
+                  Grid.Row="5"
+                  Grid.Column="1"
+                  IsChecked="False"
+                  VerticalAlignment="Center"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="CalendarDisplayMode:"
+                   Grid.Row="6"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_calendarDisplayMode"
+                  Grid.Row="6"
+                  Grid.Column="1"
+                  SelectedIndex="0"
+                  ItemsSource="{Binding Source={StaticResource enumCalendarDisplayMode}}"
+                  Width="185"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="ShowDropDownButton:"
+                   Grid.Row="7"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_showDropDownButton"
+                  Grid.Row="7"
+                  Grid.Column="1"
+                  IsChecked="True"
+                  VerticalAlignment="Center"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="TimePickerVisibility:"
+                   Grid.Row="8"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_timePickerVisibility"
+                  Grid.Row="8"
+                  Grid.Column="1"
+                  SelectedIndex="0"
+                  ItemsSource="{Binding Source={StaticResource enumVisibility}}"
+                  Width="185"
+                  Margin="5,5,25,5" />
+        <TextBlock Text="TimePickerShowButtonSpinner:"
+                   Grid.Row="9"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_timePickerShowButtonSpinner"
+                  Grid.Row="9"
+                  Grid.Column="1"
+                  IsChecked="True"
+                  VerticalAlignment="Center"
+                  Margin="5" />
+        <TextBlock Text="TodayButtonVisibility:"
+                   Grid.Row="10"
+                   Grid.Column="0"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_todayButtonVisibility"
+                  Grid.Row="10"
+                  Grid.Column="1"
+                  SelectedIndex="0"
+                  ItemsSource="{Binding Source={StaticResource enumVisibility}}"
+                  Width="185"
+                  Margin="5,5,25,5" />
+
+
+        <TextBlock Text="TimeFormat:"
+                   Grid.Row="0"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_timeFormat"
+                  Grid.Row="0"
+                  Grid.Column="3"
+                  SelectedIndex="7"
+                  ItemsSource="{Binding Source={StaticResource enumDateFormatData}}"
+                  Width="185"
+                  Margin="5" />
+        <TextBlock Text="Time FormatString:"
+                   Grid.Row="1"
+                   Grid.Column="2"
+                   VerticalAlignment="Center"
+                   IsEnabled="{Binding IsEnabled, ElementName=_timeFormatString}"
+                   Style="{StaticResource DisableGrayText}" />
+        <TextBox x:Name="_timeFormatString"
+                 Grid.Row="1"
+                 Grid.Column="3"
+                 Text="H:mm"
+                 Width="185"
+                 IsEnabled="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem, Converter={StaticResource CustomFormatToBoolConverter}}"
+                 Margin="5" />
+        <TextBlock Text="TimeWatermark:"
+                   Grid.Row="2"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <TextBox x:Name="_timeWatermark"
+                 Grid.Row="2"
+                 Grid.Column="3"
+                 Text="Enter Text"
+                 Width="185"
+                 VerticalAlignment="Center"
+                 Margin="5" />
+        <TextBlock Text="Minimum:"
+                   Grid.Row="3"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <xctk:DateTimeUpDown x:Name="_minimum"
+                             Grid.Row="3"
+                             Grid.Column="3"
+                             Format="Custom"
+                             FormatString="yyyy/MM/dd HH:mm"
+                             Value="2016/01/01T12:00"
+                             Width="185"
+                             VerticalAlignment="Center"
+                             Margin="5" />
+        <TextBlock Text="Maximum:"
+                   Grid.Row="4"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <xctk:DateTimeUpDown x:Name="_maximum"
+                             Grid.Row="4"
+                             Grid.Column="3"
+                             Format="Custom"
+                             FormatString="yyyy/MM/dd HH:mm"
+                             Value="2022/12/31T12:00"
+                             Width="185"
+                             VerticalAlignment="Center"
+                             Margin="5" />
+        <TextBlock Text="CurrentDateTimePart:"
+                   Grid.Row="5"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_currentDateTimePart"
+                  Grid.Row="5"
+                  Grid.Column="3"
+                  SelectedIndex="0"
+                  ItemsSource="{Binding Source={StaticResource enumDateTimePart}}"
+                  Width="185"
+                  Margin="5"
+                  ToolTip="Must match a DateTimePart of the DateTimePicker Format." />
+        <TextBlock Text="Auto Clip time Parts:"
+                   Grid.Row="6"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_autoClipTimeParts"
+                  Grid.Row="6"
+                  Grid.Column="3"
+                  IsChecked="False"
+                  VerticalAlignment="Center"
+                  Margin="5" />
+        <TextBlock Text="Kind:"
+                   Grid.Row="7"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <ComboBox x:Name="_kind"
+                  Grid.Row="7"
+                  Grid.Column="3"
+                  SelectedIndex="2"
+                  ItemsSource="{Binding Source={StaticResource enumKind}}"
+                  Width="185"
+                  Margin="5" />
+        <TextBlock Text="CalendarWidth:"
+                   Grid.Row="8"
+                   Grid.Column="2"
+                   VerticalAlignment="Center" />
+        <xctk:DoubleUpDown x:Name="_calendarWidth"
+                           Grid.Row="8"
+                           Grid.Column="3"
+                           Value="178"
+                           Minimum="100"
+                           Maximum="500"
+                           Width="185"
+                           Margin="5" />
+      </Grid>
+    </GroupBox>
+
+    <StackPanel Grid.Row="1"
+                Grid.Column="0"
+                HorizontalAlignment="Left">
+      <TextBlock Text="DateTimePicker Usage: "
+                 Margin="0,10,0,0"
+                 Style="{StaticResource Header}" />
+      <xctk:DateTimePicker x:Name="_datetimePicker"
+                           Width="300"
+                           VerticalAlignment="Top"
+                           IsReadOnly="False"
+                           Format="{Binding Source={x:Reference _format}, Path=SelectedItem}"
+                           FormatString="{Binding Text, ElementName=_formatString}"
+                           Watermark="{Binding  Source={x:Reference _watermark}, Path=Text}"
+                           TimeFormat="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
+                           TimeFormatString="{Binding Text, ElementName=_timeFormatString}"
+                           TimeWatermark="{Binding  Source={x:Reference _timeWatermark}, Path=Text}"
+                           AutoCloseCalendar="{Binding IsChecked, ElementName=_autoCloseCalendar}"
+                           ClipValueToMinMax="{Binding IsChecked, ElementName=_clipValueToMinMax}"
+                           TimePickerVisibility="{Binding Source={x:Reference _timePickerVisibility}, Path=SelectedItem}"
+                           TimePickerShowButtonSpinner="{Binding IsChecked, ElementName=_timePickerShowButtonSpinner}"
+                           Minimum="{Binding Value, ElementName=_minimum}"
+                           Maximum="{Binding Value, ElementName=_maximum}"
+                           Kind="{Binding SelectedItem, ElementName=_kind}"
+                           CalendarDisplayMode="{Binding SelectedItem, ElementName=_calendarDisplayMode}"
+                           CalendarWidth="{Binding Value, ElementName=_calendarWidth}"
+                           ShowDropDownButton="{Binding IsChecked, ElementName=_showDropDownButton}"
+                           CurrentDateTimePart="{Binding SelectedItem, ElementName=_currentDateTimePart, Mode=TwoWay}"
+                           AutoClipTimeParts="{Binding IsChecked, ElementName=_autoClipTimeParts}" />
+    </StackPanel>
+
+    <StackPanel Grid.Row="1"
+                Grid.Column="1"
+                HorizontalAlignment="Stretch">
+      <GroupBox Header="TimePicker Features"
+                Margin="0,15,0,0">
+        <Grid>
+          <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+          </Grid.RowDefinitions>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+
+          <TextBlock Text="StartTime:"
+                     VerticalAlignment="Center" />
+          <xctk:DateTimeUpDown x:Name="_startTime"
+                               Grid.Column="1"
+                               Format="ShortTime"
+                               Value="9:00"
+                               Width="100"
+                               Margin="5" />
+          <TextBlock Text="EndTime:"
+                     Grid.Row="1"
+                     VerticalAlignment="Center" />
+          <xctk:DateTimeUpDown x:Name="_endTime"
+                               Grid.Row="1"
+                               Grid.Column="1"
+                               Format="ShortTime"
+                               Value="17:00"
+                               Width="100"
+                               Margin="5" />
+          <TextBlock Text="TimeInterval:"
+                     Grid.Row="2"
+                     VerticalAlignment="Center" />
+          <xctk:DateTimeUpDown x:Name="_timeInterval"
+                               Grid.Row="2"
+                               Grid.Column="1"
+                               Format="Custom"
+                               FormatString="H:mm"
+                               Value="0:30"
+                               Width="100"
+                               Margin="5" />
+          <TextBlock Grid.Row="3"
+                     Text="MaxDropDownHeight:"
+                     VerticalAlignment="Center" />
+          <xctk:DoubleUpDown x:Name="_maxDropDownHeight"
+                             Grid.Row="3"
+                             Grid.Column="1"
+                             Width="100"
+                             Value="130"
+                             DefaultValue="130"
+                             AllowInputSpecialValues="PositiveInfinity"
+                             Minimum="0" />
+        </Grid>
       </GroupBox>
 
-      <StackPanel Grid.Row="1" Grid.Column="0" HorizontalAlignment="Left">
-            <TextBlock Text="DateTimePicker Usage: " Margin="0,10,0,0" Style="{StaticResource Header}" />
-            <xctk:DateTimePicker x:Name="_datetimePicker"
-                                 Width="300"
-                                 VerticalAlignment="Top"
-                                 IsReadOnly="False"
-                                 Format="{Binding Source={x:Reference _format}, Path=SelectedItem}"
-                                 FormatString="{Binding Text, ElementName=_formatString}"
-                                 Watermark="{Binding  Source={x:Reference _watermark}, Path=Text}"
-                                 TimeFormat="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
-                                 TimeFormatString="{Binding Text, ElementName=_timeFormatString}"
-                                 TimeWatermark="{Binding  Source={x:Reference _timeWatermark}, Path=Text}"
-                                 AutoCloseCalendar="{Binding IsChecked, ElementName=_autoCloseCalendar}"
-                                 ClipValueToMinMax="{Binding IsChecked, ElementName=_clipValueToMinMax}"
-                                 TimePickerVisibility="{Binding Source={x:Reference _timePickerVisibility}, Path=SelectedItem}"
-                                 TimePickerShowButtonSpinner="{Binding IsChecked, ElementName=_timePickerShowButtonSpinner}"
-                                 Minimum="{Binding Value, ElementName=_minimum}"
-                                 Maximum="{Binding Value, ElementName=_maximum}"
-                                 Kind="{Binding SelectedItem, ElementName=_kind}"
-                                 CalendarDisplayMode="{Binding SelectedItem, ElementName=_calendarDisplayMode}"
-                                 CalendarWidth="{Binding Value, ElementName=_calendarWidth}"
-                                 ShowDropDownButton="{Binding IsChecked, ElementName=_showDropDownButton}"
-                                 CurrentDateTimePart="{Binding SelectedItem, ElementName=_currentDateTimePart, Mode=TwoWay}"
-                                 AutoClipTimeParts="{Binding IsChecked, ElementName=_autoClipTimeParts}"/>
-        </StackPanel>
-
-        <StackPanel Grid.Row="1" Grid.Column="1" HorizontalAlignment="Stretch">
-            <GroupBox Header="TimePicker Features" Margin="0,15,0,0">
-                <Grid>
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto" />
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
-
-                    <TextBlock Text="StartTime:" VerticalAlignment="Center" />
-                    <xctk:DateTimeUpDown x:Name="_startTime" Grid.Column="1" Format="ShortTime" Value="9:00" Width="100" Margin="5"/>
-                    <TextBlock Text="EndTime:" Grid.Row="1" VerticalAlignment="Center" />
-                    <xctk:DateTimeUpDown x:Name="_endTime" Grid.Row="1" Grid.Column="1" Format="ShortTime" Value="17:00" Width="100" Margin="5"/>
-                    <TextBlock Text="TimeInterval:" Grid.Row="2" VerticalAlignment="Center" />
-                    <xctk:DateTimeUpDown x:Name="_timeInterval" Grid.Row="2" Grid.Column="1" Format="Custom" FormatString="H:mm" Value="0:30" Width="100" Margin="5"/>
-                    <TextBlock Grid.Row="3" Text="MaxDropDownHeight:" VerticalAlignment="Center" />
-                    <xctk:DoubleUpDown x:Name="_maxDropDownHeight" Grid.Row="3" Grid.Column="1" Width="100" Value="130" DefaultValue="130" AllowInputSpecialValues="PositiveInfinity" Minimum="0" />
-                 </Grid>
-              </GroupBox>
-
-              <StackPanel>
-                <TextBlock Text="TimePicker Usage: " Style="{StaticResource Header}" />
-                <xctk:TimePicker x:Name="_timePicker"
-                                 VerticalAlignment="Top"
-                                 Format="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
-                                 FormatString="{Binding Text, ElementName=_timeFormatString}"
-                                 Watermark="{Binding Source={x:Reference _timeWatermark}, Path=Text}"
-                                 StartTime="{Binding Source={x:Reference _startTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
-                                 EndTime="{Binding Source={x:Reference _endTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
-                                 TimeInterval="{Binding Source={x:Reference _timeInterval}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
-                                 ClipValueToMinMax="{Binding IsChecked, ElementName=_clipValueToMinMax}"
-                                 Minimum="{Binding Value, ElementName=_minimum}"
-                                 Maximum="{Binding Value, ElementName=_maximum}"
-                                 MaxDropDownHeight="{Binding Value, ElementName=_maxDropDownHeight}"
-                                 ShowDropDownButton="{Binding IsChecked, ElementName=_showDropDownButton}"
-                                 AutoClipTimeParts="{Binding IsChecked, ElementName=_autoClipTimeParts}" />
-           </StackPanel>
-        </StackPanel>
-    </Grid>
+      <StackPanel>
+        <TextBlock Text="TimePicker Usage: "
+                   Style="{StaticResource Header}" />
+        <xctk:TimePicker x:Name="_timePicker"
+                         VerticalAlignment="Top"
+                         Format="{Binding Source={x:Reference _timeFormat}, Path=SelectedItem}"
+                         FormatString="{Binding Text, ElementName=_timeFormatString}"
+                         Watermark="{Binding Source={x:Reference _timeWatermark}, Path=Text}"
+                         StartTime="{Binding Source={x:Reference _startTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
+                         EndTime="{Binding Source={x:Reference _endTime}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
+                         TimeInterval="{Binding Source={x:Reference _timeInterval}, Path=Value, Converter={StaticResource dateTimeToTimeSpanConverter}}"
+                         ClipValueToMinMax="{Binding IsChecked, ElementName=_clipValueToMinMax}"
+                         Minimum="{Binding Value, ElementName=_minimum}"
+                         Maximum="{Binding Value, ElementName=_maximum}"
+                         MaxDropDownHeight="{Binding Value, ElementName=_maxDropDownHeight}"
+                         ShowDropDownButton="{Binding IsChecked, ElementName=_showDropDownButton}"
+                         AutoClipTimeParts="{Binding IsChecked, ElementName=_autoClipTimeParts}" />
+      </StackPanel>
+    </StackPanel>
+  </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/DateTime/Views/DateTimeView.xaml.cs
index 1bf2ddfe..dd0df044 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -24,7 +24,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.DateTime.Views
   {
     public DateTimeView()
     {
-      InitializeComponent(); 
+      InitializeComponent();
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml
index 82ed3892..0efc30d1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -22,10 +22,10 @@
                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
                 Title="ExtendedTabControl">
 
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
-                 FontFamily="Segoe">
-         <Run>The ExtendedTabControl is a TabControl that offers a different navigation style. Instead of displaying the tabs on multiple lines when there are too many to fit in the view, the ExtendedTabContol offers the ability for the user to navigate left/right, and/or use a drop down list.</Run>
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      <Run>The ExtendedTabControl is a TabControl that offers a different navigation style. Instead of displaying the tabs on multiple lines when there are too many to fit in the view, the ExtendedTabContol offers the ability for the user to navigate left/right, and/or use a drop down list.</Run>
          <LineBreak />
          <LineBreak />
          <Run>This feature is only available in the "Plus" version.</Run>
@@ -34,7 +34,9 @@
             Click here for more details about Xceed Toolkit Plus for WPF.
          </Hyperlink>
     </Paragraph>
-   </local:DemoView.Description>
+  </local:DemoView.Description>
+
+
 
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml.cs
index 159d39f0..1fa36388 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/ExtTabControl/Views/ExtTabControlView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -38,5 +38,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ExtendedTabControl.Views
 
 
 
-    }
   }
+}
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 0b564ae2..bde179ef 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 de0fd61b..db34ca51 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,7 @@
 
   ************************************************************************************/
 
-using System.Collections.ObjectModel;
 using System.Collections.Specialized;
-using System.Windows;
-using System.Windows.Data;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.FilePicker.Views
 {
   /// <summary>
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 ce8ed6b3..afd1e851 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 61a7de60..31427e80 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,10 +16,7 @@
   ***********************************************************************************/
 
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Windows;
-using Xceed.Wpf.Toolkit;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Gauge.Views
 {
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 e5446788..531eb429 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 c3999de2..983f9d75 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7b8591df..91d73b7f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,12 +15,8 @@
 
   ************************************************************************************/
 
-using System;
-using System.IO;
-using System.Windows;
-using System.Windows.Resources;
-using Xceed.Wpf.Samples.SampleData;
 using System.ComponentModel;
+using Xceed.Wpf.Samples.SampleData;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ListBox.Views
 {
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 58f3242d..e1c74684 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   ************************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Data;
 using System.Windows.Media;
 
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 3f7176b1..9c65e703 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,13 +16,8 @@
   ************************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit;
 using System.Windows;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Converters
 {
@@ -34,8 +29,8 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Converters
     {
       if( value is FrameType )
       {
-        FrameType frameType = (FrameType)value;
-        int param = int.Parse((string)parameter);
+        FrameType frameType = ( FrameType )value;
+        int param = int.Parse( ( string )parameter );
         switch( frameType )
         {
           case FrameType.Circle:
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 fffb13d2..1608c3bb 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 25862099..1d9ab48b 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -33,7 +33,15 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Magnifier.Views
 
       // Load and display the RTF file.
       Uri uri = new Uri( "pack://application:,,,/" +
-         "Xceed.Wpf.Toolkit.LiveExplorer"
+
+#if NETCORE
+            "Xceed.Wpf.Toolkit.LiveExplorer.NETCore"
+#elif NET5
+            "Xceed.Wpf.Toolkit.LiveExplorer.NET5"
+#else
+            "Xceed.Wpf.Toolkit.LiveExplorer"
+#endif
+
         + ";component/Samples/Magnifier/Resources/SampleText.rtf" );
       StreamResourceInfo info = Application.GetResourceStream( uri );
       using( StreamReader txtReader = new StreamReader( info.Stream ) )
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 2df496aa..e9f31213 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,7 @@
 
   ************************************************************************************/
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Converters
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Data/RequiredRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Data/RequiredRule.cs
index beee333e..3da00911 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -14,11 +14,7 @@
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   ************************************************************************************/
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 using System.Windows.Controls;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Data
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/CommonResources.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MaterialControls/Resources/CommonResources.xaml
index 0bbec943..f32c8b49 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 566baccb..87c9ed34 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 f01543b9..b10ec52b 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   **************************************************************************************/
 
 
-using System;
-using System.Collections.Generic;
-using System.Windows;
 using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
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 4061627a..a2b95079 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 542a2d66..fda03bec 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 6b05ee3a..6b6f551f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e0f571b4..9f08f684 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 0b355db5..f542069d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 b7263eff..2cb25c2b 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 c25d147a..9938c9e1 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,8 +17,6 @@
 
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Media;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer
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 b860e045..79639dd1 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 fb17a2be..d713e355 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 b8fd5574..7019d573 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e8c20bd8..0581e516 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 769b1dbf..44a72322 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 b19bf711..9f6288e5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 dc0f989a..d0c97546 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7747a90c..a94f2010 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 b09c8355..77c2a881 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 087292d1..9cb3101d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,10 +16,7 @@
   **************************************************************************************/
 
 
-using System;
-using System.Collections.Generic;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Media.Animation;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
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 c7e1fe91..d7fc7fdc 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 df9e8152..4178d498 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,10 +16,7 @@
   **************************************************************************************/
 
 
-using System;
-using System.Collections.Generic;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Media.Animation;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
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 be2b5998..8d2a77d3 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 548bfc7b..d983f7c6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 d2f8e316..9b3b14d4 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7b577a81..e37bd6f5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,14 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using Xceed.Wpf.Toolkit.Panels;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 dfc8b1a5..6f4c46de 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 3464e945..a405f551 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 b3d356f5..2b95642f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 57c26a72..2e4b3b4b 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 ba95e5a7..895f4f04 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e5cb2d78..c3e6ccb7 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 7d5ff8dc..12f4146f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 b06f5c72..d9ab291c 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 4f4a54e7..8aaa6e54 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e7f11356..d83b27f7 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   **************************************************************************************/
 
-
-using System;
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Controls;
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MaterialControls.Views
 {
   /// <summary>
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 af4361cc..94b96691 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml.cs
index 9816a35f..1e05665c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/MultiCalendar/Views/MultiCalendarView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,10 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls;
 using System;
-using System.Windows.Media;
 using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views
 {
@@ -43,5 +43,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.MultiCalendar.Views
 
 
 
-      }
+  }
 }
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 6c576e2c..a11713e5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7cf2ab99..5b72a51f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,7 +17,6 @@
 
 using System.Collections.Generic;
 using System.Globalization;
-using System;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Numeric.Views
 {
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 1ea8ba0d..dfafb4c7 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,12 +15,9 @@
 
   *************************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Globalization;
 using System.Windows;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Converters
 {
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 ce06f11f..83cbc804 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 f9365099..ba234ff4 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,16 +15,11 @@
 
   ************************************************************************************/
 
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System;
+using System.IO;
 using System.Windows;
+using System.Windows.Controls;
 using Xceed.Wpf.Toolkit.Panels;
-using System.Collections.Generic;
-using Xceed.Wpf.Toolkit;
-using System.Text.RegularExpressions;
-using System.IO;
-using System.Diagnostics;
 using System.Windows.Media.Imaging;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views
@@ -151,7 +146,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Panels.Views
 
 
 
-    #endregion 
+    #endregion
 
     #region Methods (Private)
 
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 0ed7dddf..7c8c7d85 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -14,10 +14,6 @@
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   ************************************************************************************/
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Converters
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 dd23dc49..a952ec92 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 ff36906b..c0ee5ae8 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   ************************************************************************************/
 
-using System.Windows.Data;
-using Xceed.Wpf.Toolkit.LiveExplorer;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views
 {
   /// <summary>
@@ -29,5 +26,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views
     {
       InitializeComponent();
     }
-  } 
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Pie/Views/PieProgressView.xaml
index 03492d51..c210046e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 6c041310..b3c2ec22 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,6 @@
 
   ************************************************************************************/
 
-using System.Windows.Data;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views
 {
   /// <summary>
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 8df6b348..b6ceb68a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 f09328af..79c01879 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,14 +15,7 @@
 
   **************************************************************************************/
 
-using System.Windows.Data;
-using System.Windows.Media;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Linq;
-using System.Reflection;
 using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Pie.Views
 {
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 68618094..a677d35b 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,12 +15,9 @@
 
   *************************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Globalization;
 using System.Windows;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Converters
 {
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 6fdc00e4..376dc070 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 5e2be371..6b221b73 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,17 +15,14 @@
 
   *************************************************************************************/
 
-using System.Windows.Media;
-using System.Windows.Controls;
 using System;
-using System.Diagnostics;
-using System.Windows;
-using Xceed.Wpf.Toolkit;
+using System.Collections.ObjectModel;
 using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Xceed.Wpf.Samples.SampleData;
-using System.Collections.ObjectModel;
-using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PileFlowPanel.Views
 {
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 89170803..1414b605 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   ************************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Data;
 using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
 
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 0af244a1..4c3a9552 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 b8b9d096..15316dcc 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAdvancedContextMenuView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAdvancedContextMenuView.xaml.cs
index 391d6e3a..7969e2d3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAdvancedContextMenuView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridAdvancedContextMenuView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,21 +15,9 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-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.Shapes;
 using Xceed.Wpf.Toolkit.PropertyGrid;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
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 903eac74..adfaa68e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 a5e85d93..d43fc71f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,7 +15,6 @@
 
   *************************************************************************************/
 
-using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
@@ -53,7 +52,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     }
   }
 
-  [CategoryOrder("Information", 0)]
+  [CategoryOrder( "Information", 0 )]
   [CategoryOrder( "Conections", 1 )]
   [CategoryOrder( "Other", 2 )]
   public abstract class Person : INotifyPropertyChanged
@@ -64,60 +63,95 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     [Category( "Information" )]
     [Description( "This property uses the [DisplayName(\"Is a Men\")] attribute to customize the name of this property." )]
     [DisplayName( "Is male" )]
-    public bool IsMale { get; set; }
+    public bool IsMale
+    {
+      get; set;
+    }
 
     [Category( "Information" )]
     [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'FirstNameEditor' class. In the Plus version, it also depends on the IsMale property to change its foreground and source." )]
     [Editor( typeof( FirstNameEditor ), typeof( FirstNameEditor ) )]
     public string FirstName
     {
-      get{ return _firstName; }
-      set{ _firstName = value; OnPropertyChanged( "FirstName" );}
+      get
+      {
+        return _firstName;
+      }
+      set
+      {
+        _firstName = value;
+        OnPropertyChanged( "FirstName" );
+      }
     }
     private string _firstName;
 
     [Category( "Information" )]
     [Description( "This property uses the [Editor(..)] attribute to provide a custom editor using the 'LastNameUserControlEditor' user control." )]
     [Editor( typeof( LastNameUserControlEditor ), typeof( LastNameUserControlEditor ) )]
-    [DefaultValue("Friend")]
+    [DefaultValue( "Friend" )]
     public string LastName
     {
-      get{ return _lastName; }
-      set{ _lastName = value; OnPropertyChanged( "LastName" );}
+      get
+      {
+        return _lastName;
+      }
+      set
+      {
+        _lastName = value;
+        OnPropertyChanged( "LastName" );
+      }
     }
     private string _lastName;
 
     [Category( "Conections" )]
     [Description( "This property uses the [NewItemTypes(...)] attribute to provide the underlying CollectionEditor with class types (eg. Man, Woman) that can be inserted in the collection." )]
     [NewItemTypes( typeof( Man ), typeof( Woman ) )]
-    public List<Person> Friends { get; set; }
+    public List<Person> Friends
+    {
+      get; set;
+    }
 
     [Category( "Information" )]
     [DisplayName( "Writing Font Size" )]
     [Description( "This property defines the [ItemsSource(..)] attribute that allows you to specify a ComboBox editor and control its items." )]
     [ItemsSource( typeof( FontSizeItemsSource ) )]
     [RefreshProperties( RefreshProperties.All )]    //This will reload the PropertyGrid
-    public double WritingFontSize { get; set; }
+    public double WritingFontSize
+    {
+      get; set;
+    }
 
     [Category( "Conections" )]
     [Description( "This property defines the [ExpandableObject()] attribute. This allows you to expand this property and drill down through its values." )]
     [ExpandableObject()]
-    public Person Spouse { get; set; }
+    public Person Spouse
+    {
+      get; set;
+    }
 
     [Category( "Other" )]
     [Description( "This property uses the [PropertyOrder(1)] attribute to control its position in the categorized and non-categorized views. Otherwise, alphabetical order is used." )]
     [PropertyOrder( 1 )]
-    public string A_SecondProperty { get; set; }
+    public string A_SecondProperty
+    {
+      get; set;
+    }
 
     [Category( "Other" )]
     [Description( "This property uses the [PropertyOrder(0)] attribute to control its position in the categorized and non-categorized view. Otherwise, alphabetical order is used." )]
     [PropertyOrder( 0 )]
-    public string B_FirstProperty { get; set; }
+    public string B_FirstProperty
+    {
+      get; set;
+    }
 
     [Category( "Other" )]
     [Description( "This property uses the [ParenthesizePropertyName()] attribute to force the name to be displayed within round brackets." )]
-    [ParenthesizePropertyNameAttribute(true)]
-    public string NameInParentheses { get; set; }
+    [ParenthesizePropertyNameAttribute( true )]
+    public string NameInParentheses
+    {
+      get; set;
+    }
 
     [Category( "Other" )]
     [Description( "This property uses the [Browsable(false)] attribute to not display the property" )]
@@ -128,9 +162,9 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       set;
     }
 
-    [Range(0d, 10d)]
+    [Range( 0d, 10d )]
     [Category( "Other" )]
-    [DefaultValue(5d)]
+    [DefaultValue( 5d )]
     [Description( "This property uses the [Range(0,10)] and DefaultValue attributes to set the Minimum, Maximum and default properties." )]
     public double RangeDouble
     {
@@ -166,15 +200,27 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
             , GroupName = "Information"
             , AutoGenerateField = true
             , AutoGenerateFilter = false )]
-    public string FavoriteSport { get; set; }
-    public Man() { this.IsMale = true; }
+    public string FavoriteSport
+    {
+      get; set;
+    }
+    public Man()
+    {
+      this.IsMale = true;
+    }
   }
   public class Woman : Person
   {
     [Category( "Information" )]
     [Description( "This property has no special attribute besides [Categroy(\"Information\")] and [Description(...)]" )]
-    public string FavoriteRestaurant { get; set; }
-    public Woman() { this.IsMale = false; }
+    public string FavoriteRestaurant
+    {
+      get; set;
+    }
+    public Woman()
+    {
+      this.IsMale = false;
+    }
   }
 
   // This is the custom editor referenced by the "EditorAttribute"
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 31305ffb..93af39e6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 63ccdb01..46aca0d5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,7 @@
 
   ************************************************************************************/
 
-using System;
 using System.ComponentModel;
-using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
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 8d999818..3eb01769 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 c51fee6e..2b34ff74 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,13 +15,8 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Windows;
-using System.Windows.Media;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
@@ -40,35 +35,63 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     [CategoryOrder( "Information", 1 )]
     [CategoryOrder( "Hobbies", 2 )]
     [CategoryOrder( "Connections", 3 )]
-    public class PersonOrdered : PersonBase { }
+    public class PersonOrdered : PersonBase
+    {
+    }
 
-    public class PersonNonOrdered : PersonBase { }
+    public class PersonNonOrdered : PersonBase
+    {
+    }
 
     public abstract class PersonBase
     {
       [Category( "Information" )]
-      public string FirstName { get; set; }
+      public string FirstName
+      {
+        get; set;
+      }
 
       [Category( "Information" )]
-      public string LastName { get; set; }
+      public string LastName
+      {
+        get; set;
+      }
 
       [Category( "Hobbies" )]
-      public bool Baseball { get; set; }
+      public bool Baseball
+      {
+        get; set;
+      }
 
       [Category( "Hobbies" )]
-      public bool Football { get; set; }
+      public bool Football
+      {
+        get; set;
+      }
 
       [Category( "Hobbies" )]
-      public bool Basketball { get; set; }
+      public bool Basketball
+      {
+        get; set;
+      }
 
       [Category( "Connections" )]
-      public string Father { get; set; }
+      public string Father
+      {
+        get; set;
+      }
 
       [Category( "Connections" )]
-      public string Mother { get; set; }
+      public string Mother
+      {
+        get; set;
+      }
 
       [Category( "Connections" )]
-      public bool HasChildren { get; set; }
+      public bool HasChildren
+      {
+        get; set;
+      }
 
       public static PersonBase InitPerson( PersonBase person )
       {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridCustomEditorsView.xaml
index 9b45018f..bc1436af 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 d9a8a095..7d8f62d6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,15 +15,10 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Media;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
@@ -121,7 +116,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       }
 
       [Category( "Information" )]
-      [Browsable(false)]
+      [Browsable( false )]
       [Description( "This property is not displayed in the PropertyGrid, but its used as the selectedItem of the ComboBox for the 'Friends' property Editor." )]
       public Friend BestFriend
       {
@@ -151,7 +146,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       {
         get;
         set;
-      }     
+      }
     }
 
     public class Friend
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 5ea650f7..2aef7fc6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 31225428..0279b257 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,14 +15,6 @@
 
   ************************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Media;
-using System.Linq;
-using System.Collections.ObjectModel;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
   /// <summary>
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 a3fcdfcc..8b0aafe3 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 f43e281f..bfad53bf 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,7 +16,6 @@
   ************************************************************************************/
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -41,7 +40,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       selectedObject.Color = Colors.Blue;
       selectedObject.DateTime = System.DateTime.Now;
       selectedObject.Decimal = ( decimal )2;
-      selectedObject.Double = (double)3;
+      selectedObject.Double = ( double )3;
       selectedObject.Enum = HorizontalAlignment.Center;
       selectedObject.FontFamily = new FontFamily( "Arial" );
       selectedObject.FontStretch = FontStretches.Normal;
@@ -51,21 +50,21 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       selectedObject.Char = 'T';
       selectedObject.Password = "This is my password";
       selectedObject.Int16 = ( short )4;
-      selectedObject.Int32 = (int)5;
-      selectedObject.Int64 = (long)6;
+      selectedObject.Int32 = ( int )5;
+      selectedObject.Int64 = ( long )6;
       selectedObject.ListOfInt32 = new List<int>() { 1, 2, 3 };
       selectedObject.ListOfPerson = new List<Person>() { new Person() { Name = "John Smith" }, new Person() { Name = "Robert King" } };
       selectedObject.ListOfStrings = new List<string>() { "string1", "string2", "string3" };
       selectedObject.Dictionary = new Dictionary<int, System.Windows.Media.Color>() { { 22, System.Windows.Media.Color.FromRgb( 255, 0, 0 ) }, { 33, System.Windows.Media.Color.FromRgb( 0, 255, 0 ) } };
       selectedObject.CollectionOfPerson = new Collection<Person>() { new Person() { Name = "Tom McNeil" }, new Person() { Name = "Mike Campbell" } };
       selectedObject.Person = new Person() { Name = "John Smith" };
-      selectedObject.SByte = (sbyte) 7;
-      selectedObject.Single = (float)8;
+      selectedObject.SByte = ( sbyte )7;
+      selectedObject.Single = ( float )8;
       selectedObject.String = "this is a string";
-      selectedObject.TimeSpan = System.TimeSpan.FromHours( 2 );      
-      selectedObject.UInt16 = (ushort)9;
-      selectedObject.UInt32 = (uint)10;
-      selectedObject.UInt64 = (ulong)11;
+      selectedObject.TimeSpan = System.TimeSpan.FromHours( 2 );
+      selectedObject.UInt16 = ( ushort )9;
+      selectedObject.UInt32 = ( uint )10;
+      selectedObject.UInt64 = ( ulong )11;
 
       this.DataContext = selectedObject;
     }
@@ -74,25 +73,46 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     {
       [Category( "Non-Numeric Editors" )]
       [Description( "(C# string type) This property uses a TextBox as the default editor." )]
-      public string String { get; set; }
+      public string String
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "(C# bool type) This property uses a CheckBox as the default editor." )]
-      public bool Boolean { get; set; }
+      public bool Boolean
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# int type) This property uses an IntegerUpDown as the default editor." )]
-      public int Int32 { get; set; }
+      public int Int32
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# double type) This property uses a DoubleUpDown as the default editor." )]
-      public double Double { get; set; }
+      public double Double
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# short type) This property uses a ShortUpDown as the default editor." )]
-      public short Int16 { get; set; }
+      public short Int16
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# long type) This property uses a LongUpDown as the default editor." )]
-      public long Int64 { get; set; }
+      public long Int64
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# float type) This property uses a SingleUpDown as the default editor." )]
-      public float Single { get; set; }      
+      public float Single
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# decimal type) This property uses a Decimal as the default editor." )]
       public decimal Decimal
@@ -102,64 +122,124 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       }
       [Category( "Numeric Editors" )]
       [Description( "(C# byte type) This property uses a ByteUpDown as the default editor." )]
-      public byte Byte { get; set; }
+      public byte Byte
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# sbyte type) This property uses a SByteUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )]
-      public sbyte SByte { get; set; }
+      public sbyte SByte
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# uint type) This property uses a UInteger as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )]
-      public uint UInt32 { get; set; }
+      public uint UInt32
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# ulong type) This property uses a ULongUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )]
-      public ulong UInt64 { get; set; }
+      public ulong UInt64
+      {
+        get; set;
+      }
       [Category( "Numeric Editors" )]
       [Description( "(C# ushort type) This property uses a UShortUpDown as the default editor. This is an internal class for CLS compliance reasons. Can only be autogenerated." )]
-      public ushort UInt16 { get; set; }
+      public ushort UInt16
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a DateTimeUpDown as the default editor." )]
-      public System.DateTime DateTime { get; set; }
+      public System.DateTime DateTime
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a TimeSpanUpDown as the default editor." )]
-      public System.TimeSpan TimeSpan { get; set; }
+      public System.TimeSpan TimeSpan
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a ColorPicker as the default editor." )]
-      public System.Windows.Media.Color? Color { get; set; }
+      public System.Windows.Media.Color? Color
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "(C# enum type) This property uses a ComboBox as the default editor. The ComboBox is auto-populated with the enum values." )]
-      public HorizontalAlignment Enum { get; set; }
+      public HorizontalAlignment Enum
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a ComboBox as the default editor." )]
-      public FontFamily FontFamily { get; set; }
+      public FontFamily FontFamily
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a ComboBox as the default editor." )]
-      public FontWeight FontWeight { get; set; }
+      public FontWeight FontWeight
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a ComboBox as the default editor." )]
-      public FontStyle FontStyle { get; set; }
+      public FontStyle FontStyle
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a ComboBox as the default editor." )]
-      public FontStretch FontStretch { get; set; }
+      public FontStretch FontStretch
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a Guid as the default editor." )]
-      public Guid Guid { get; set; }
+      public Guid Guid
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a Char as the default editor." )]
-      public Char Char { get; set; }
+      public Char Char
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
-      [PasswordPropertyText(true)]
-      public string Password { get; set; }
+      [PasswordPropertyText( true )]
+      public string Password
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a PrimitiveTypeCollectionEditor as the default editor." )]
-      public List<string> ListOfStrings { get; set; }
+      public List<string> ListOfStrings
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property uses a PrimitiveTypeCollectionEditor as the default editor." )]
-      public List<int> ListOfInt32 { get; set; }
+      public List<int> ListOfInt32
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "(C# IList<T> type) This property uses a CollectionEditor as the default editor." )]
-      public List<Person> ListOfPerson { get; set; }
+      public List<Person> ListOfPerson
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "(C# IDictionary<T> type) This property uses a CollectionEditor as the default editor." )]
-      public Dictionary<int, System.Windows.Media.Color> Dictionary { get; set; }
+      public Dictionary<int, System.Windows.Media.Color> Dictionary
+      {
+        get; set;
+      }
       [Category( "Non-Numeric Editors" )]
       [Description( "(C# ICollection<T> type) This property uses a CollectionEditor as the default editor." )]
       public Collection<Person> CollectionOfPerson
@@ -168,12 +248,18 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       }
       [Category( "Non-Numeric Editors" )]
       [Description( "This property is a complex property and has no default editor." )]
-      public Person Person { get; set; }
+      public Person Person
+      {
+        get; set;
+      }
     }
 
     public class Person
     {
-      public string Name { get; set; }
+      public string Name
+      {
+        get; set;
+      }
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridDefinitionKeyView.xaml
index d270544f..b4655a28 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 37d2aa84..00fe8330 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,7 @@
 
   *************************************************************************************/
 
-using System;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
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 898aed3f..beb1b2b5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 ab636d35..485816f5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,18 +15,11 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Windows;
-using System.Windows.Media;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 using Xceed.Wpf.Toolkit.Core;
 using System.Windows.Controls;
 using System.Globalization;
-using System.Threading;
-using Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views;
-using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml
index 6a8a7e9d..53246df5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs
index d5185036..c6929d86 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,20 +15,8 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-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.Shapes;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
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 78eb8dc9..aebc4396 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 8cb06e2b..8030ad9b 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,7 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
 using System.IO;
-using System.Windows;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
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 f71b6b24..60503663 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 be70ae8c..13d8a7c8 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 a0e52902..73cd4209 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 04fe90bd..30db9605 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,20 +15,7 @@
 
   *************************************************************************************/
 
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
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 9796c689..28d6c541 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 2a9b711a..9bf0e254 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,13 +15,11 @@
 
   *************************************************************************************/
 
-using System;
 using System.Collections.Generic;
-using System.ComponentModel;
+using System.Collections.ObjectModel;
+using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using System.Linq;
-using System.Collections.ObjectModel;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
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 283305a8..1ed17f25 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 3b3e67bc..47a4bbaa 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,14 +15,6 @@
 
   *************************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Media;
-using System.Linq;
-using System.Collections.ObjectModel;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
   /// <summary>
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 ba1fb271..8fb2e83d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -23,30 +23,30 @@
                 xmlns:s="clr-namespace:System;assembly=mscorlib"
                 VerticalScrollBarVisibility="Disabled"
                 Title="Customizing PropertyItems display">
-    <local:DemoView.Description>
-        <Paragraph FontSize="14" FontFamily="Segoe">
-         This sample demonstrates the usage of the PropertyGrid's
-         <Bold>PropertyContainerStyle</Bold> property and
-         <Bold>PreparePropertyItem</Bold> event to customize the display of the PropertyGrid content.
-      </Paragraph>
-    </local:DemoView.Description>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-      <StackPanel Grid.Row="0" Margin="10" >
-         <TextBlock Text="Using the PropertyContainerStyle property, the Foreground of all properties are set to Red."
+  <local:DemoView.Description>
+    <Paragraph FontSize="14" FontFamily="Segoe">
+      This sample demonstrates the usage of the PropertyGrid's
+      <Bold>PropertyContainerStyle</Bold> property and
+      <Bold>PreparePropertyItem</Bold> event to customize the display of the PropertyGrid content.
+    </Paragraph>
+  </local:DemoView.Description>
+
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
+    <StackPanel Grid.Row="0" Margin="10" >
+      <TextBlock Text="Using the PropertyContainerStyle property, the Foreground of all properties are set to Red."
                     TextWrapping="Wrap"
                     Margin="0,0,0,10"/>
-         <TextBlock Text="Using the PreparePropertyItem event, the display name of the property 'Friend' is changed to 'Friend (renamed)'."
+      <TextBlock Text="Using the PreparePropertyItem event, the display name of the property 'Friend' is changed to 'Friend (renamed)'."
                     TextWrapping="Wrap"
-                    Margin="0,0,0,10"/>         
-         <TextBlock Text="(CLick the XAML and Code tabs to see details,)" 
+                    Margin="0,0,0,10"/>
+      <TextBlock Text="(CLick the XAML and Code tabs to see details,)" 
                     FontStyle="Italic"
                     Margin="0,10,0,0"/>
-      </StackPanel>
+    </StackPanel>
 
 
       <xctk:PropertyGrid x:Name="_propertyGrid" Grid.Row="1" Width="350" MaxHeight="300"
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 ecba244a..6b760fdb 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,8 @@
 
   ************************************************************************************/
 
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 using Xceed.Wpf.Toolkit.PropertyGrid;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
@@ -39,7 +39,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
     {
       var propertyItem = e.PropertyItem as PropertyItem;
       // Parent of top-level properties is the PropertyGrid itself.
-      bool isTopLevelProperty = 
+      bool isTopLevelProperty =
         ( propertyItem.ParentElement is Xceed.Wpf.Toolkit.PropertyGrid.PropertyGrid );
 
       if( isTopLevelProperty && propertyItem.PropertyDescriptor.Name == "Friend" )
@@ -50,10 +50,19 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 
     private class Person
     {
-      public string FirstName { get; set; }
-      public string LastName { get; set; }
+      public string FirstName
+      {
+        get; set;
+      }
+      public string LastName
+      {
+        get; set;
+      }
       [ExpandableObject()]
-      public Person Friend { get; set; }
+      public Person Friend
+      {
+        get; set;
+      }
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSelectedObjectView.xaml
index 052462a7..ab668c39 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 596cda37..e952cdc7 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,6 @@
 
   *************************************************************************************/
 
-using System;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
   /// <summary>
@@ -29,7 +27,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
       InitializeComponent();
     }
 
-    private void OnControlGetFocus(object sender, System.Windows.RoutedEventArgs e)
+    private void OnControlGetFocus( object sender, System.Windows.RoutedEventArgs e )
     {
       _propertyGrid.SelectedObject = e.Source;
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/PropertyGrid/Views/PropertyGridSpecifyingPropertiesView.xaml
index e4f99919..ec0eddea 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 9ed6f447..e15b28cb 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 9483ac82..5bac6876 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 60e63a1e..1436775a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,8 +15,6 @@
 
   ************************************************************************************/
 
-using System;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.PropertyGrid.Views
 {
   /// <summary>
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 c6f185d2..eca51c72 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -25,10 +25,10 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Converters
   {
     public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
     {
-      if( (values != null) && (values.Count() == 2) )
+      if( ( values != null ) && ( values.Count() == 2 ) )
       {
-        var min = (double)values[ 0 ];
-        var max = (double)values[ 1 ];
+        var min = ( double )values[ 0 ];
+        var max = ( double )values[ 1 ];
         return Math.Abs( min ) + Math.Abs( max );
       }
 
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 dfd2e761..56049287 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -27,8 +27,8 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Converters
     {
       if( value != null )
       {
-        var tickPlacement = (TickPlacement)value;
-        return (tickPlacement != TickPlacement.None);
+        var tickPlacement = ( TickPlacement )value;
+        return ( tickPlacement != TickPlacement.None );
       }
       return false;
     }
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 8c30acf2..5def958c 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 b4bdba20..7a4767c2 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   ***********************************************************************************/
 
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Windows.Controls;
 using System.Windows.Media;
 
@@ -35,14 +32,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.RangeSlider.Views
 
     private void RangeStyleComboBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
     {
-      if( e.AddedItems.Count > 0 && e.AddedItems[ 0 ] is ComboBoxItem)
+      if( e.AddedItems.Count > 0 && e.AddedItems[ 0 ] is ComboBoxItem )
       {
         ComboBoxItem item = e.AddedItems[ 0 ] as ComboBoxItem;
         //A style different from null is chosen
         if( item.Tag != null )
         {
           //LowerRangeBackground is Transparent, force a color
-          if( object.Equals( sender, lowerRangeStyleComboBox ) && ((SolidColorBrush)_rangeSlider.LowerRangeBackground).Color.Equals( Colors.Transparent) )
+          if( object.Equals( sender, lowerRangeStyleComboBox ) && ( ( SolidColorBrush )_rangeSlider.LowerRangeBackground ).Color.Equals( Colors.Transparent ) )
           {
             _rangeSlider.LowerRangeBackground = new SolidColorBrush( Colors.Green );
           }
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 67f07fdc..9b827188 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 4939998b..931d252d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,8 +16,6 @@
   ***********************************************************************************/
 
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Rating.Views
 {
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 7a38544a..a170964a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 6dca4841..4ab24bb2 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,32 +15,24 @@
 
   ***********************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
-using Xceed.Wpf.Samples.SampleData;
-using System.Windows.Media.Imaging;
-using System.IO;
+using System.Windows.Controls;
 using System.Windows.Media;
+using System.Windows.Media.Imaging;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.SlideShow.Views
 {
-    /// <summary>
-    /// Interaction logic for SlideShow.xaml
-    /// </summary>
-    public partial class SlideShowView : DemoView
+  /// <summary>
+  /// Interaction logic for SlideShow.xaml
+  /// </summary>
+  public partial class SlideShowView : DemoView
+  {
+    public SlideShowView()
     {
-        public SlideShowView()
-        {
-            InitializeComponent();
-
+      InitializeComponent();
 
-      }
 
     }
+
+  }
 }
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 c544a40e..7443dd27 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 4e0aa0c4..3f81fddd 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 6810507d..2de3941e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 baa7a3b8..f8f20dee 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 518398ec..483b245e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 90748889..223ec24f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 911d8640..25da7bca 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 98121225..a133f473 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,11 +16,6 @@
   *************************************************************************************/
 
 using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using System;
-using System.Windows.Resources;
-using System.Windows;
-using System.IO;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Text.Views
 {
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 a122ab8a..b161a10c 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 1ef04263..2b5609a4 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,21 +15,8 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 using System.ComponentModel;
-using System.Data;
 using System.Collections.ObjectModel;
 
 
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 501f8da7..fe758dfb 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7ba5f73b..0dd8980d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 2fe637c8..6c42fef1 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 741f2378..0293053e 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 849fee31..d8a62073 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   *************************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Data;
 using System.Globalization;
 using System.Windows;
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 d4b023e5..67eef4c3 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 cb3cc22f..4a0060c6 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 09901d51..042efa36 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,19 +15,11 @@
 
   ************************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using System.IO;
+using System.Windows.Media.Imaging; // For Open Source Version
+using System.IO; // For Open Source Version
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
 {
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 dbcbe26f..f2eb24ac 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 a4c88df3..7131e31f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,18 +15,12 @@
 
   ************************************************************************************/
 
-using System.Collections.Generic;
 using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using System.Windows.Controls.Primitives;
 using System;
-using System.Data;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
-using System.Diagnostics;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
 {
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 de9b041c..ca281801 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 b5dddb43..65b18290 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,17 +15,9 @@
 
   *************************************************************************************/
 
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using System.Windows.Controls.Primitives;
-using System;
 using Xceed.Wpf.Samples.SampleData;
-using System.Data;
-using System.Diagnostics;
 using System.Windows.Media;
 
 
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 51db4e83..f18668c4 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 1fbade0e..28f0c915 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,13 +15,11 @@
 
   *************************************************************************************/
 
-using System.Diagnostics;
 using System.Windows;
 using System;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Documents;
-using Microsoft.Win32;
 
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Theming.Views
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 69146161..dace699a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 cc0e3a86..340ece9d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,17 +15,11 @@
 
   *************************************************************************************/
 
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using System.Windows.Controls.Primitives;
 using System;
 using Xceed.Wpf.Samples.SampleData;
-using System.Data;
-using System.Diagnostics;
 using System.Windows.Media;
 using System.Windows.Threading;
 
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 2e681ba1..418461d1 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -29,6 +29,45 @@
     </Paragraph>
   </local:DemoView.Description>
 
+  <local:DemoView.Resources>
+    <Style TargetType="CheckBox"
+           x:Key="ShowDaysAndShowSecondsStyle">
+      <Style.Triggers>
+        <MultiDataTrigger>
+          <MultiDataTrigger.Conditions>
+            <Condition Binding="{Binding IsChecked, ElementName=_showDays}"
+                       Value="False" />
+            <Condition Binding="{Binding IsChecked, ElementName=_showHours}"
+                       Value="False" />
+          </MultiDataTrigger.Conditions>
+          <Setter Property="IsEnabled"
+                  Value="False" />
+        </MultiDataTrigger>
+      </Style.Triggers>
+    </Style>
+
+    <Style TargetType="CheckBox"
+           x:Key="ShowHoursStyle">
+      <Style.Triggers>
+        <DataTrigger Binding="{Binding IsChecked, ElementName=_showDays}"
+                     Value="True">
+          <Setter Property="IsEnabled"
+                  Value="False" />
+        </DataTrigger>
+        <MultiDataTrigger>
+          <MultiDataTrigger.Conditions>
+            <Condition Binding="{Binding IsChecked, ElementName=_showDays}"
+                       Value="False" />
+            <Condition Binding="{Binding IsChecked, ElementName=_showSeconds}"
+                       Value="False" />
+          </MultiDataTrigger.Conditions>
+          <Setter Property="IsEnabled"
+                  Value="False" />
+        </MultiDataTrigger>
+      </Style.Triggers>
+    </Style>
+  </local:DemoView.Resources>
+
   <Grid>
     <Grid.RowDefinitions>
       <RowDefinition Height="Auto" />
@@ -45,6 +84,7 @@
           <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
           <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
           <ColumnDefinition Width="Auto" />
@@ -81,38 +121,54 @@
                   IsChecked="{Binding ShowDays, ElementName=_timeSpanUpDown}"
                   HorizontalAlignment="Left"
                   VerticalAlignment="Center"
-                  Margin="5,5,25,5" />
+                  ClickMode="Press"
+                  Margin="5,5,25,5"
+                  Style="{StaticResource ShowDaysAndShowSecondsStyle}" />
         <TextBlock Grid.Row="3"
+                   Text="ShowHours:"
+                   VerticalAlignment="Center" />
+        <CheckBox x:Name="_showHours"
+                  Grid.Row="3"
+                  Grid.Column="1"
+                  IsChecked="{Binding ShowHours, ElementName=_timeSpanUpDown}"
+                  HorizontalAlignment="Left"
+                  VerticalAlignment="Center"
+                  ClickMode="Press"
+                  Margin="5,5,25,5"
+                  Style="{StaticResource ShowHoursStyle}" />
+        <TextBlock Grid.Row="4"
                    Text="ShowSeconds:"
                    VerticalAlignment="Center" />
         <CheckBox x:Name="_showSeconds"
-                  Grid.Row="3"
+                  Grid.Row="4"
                   Grid.Column="1"
                   IsChecked="{Binding ShowSeconds, ElementName=_timeSpanUpDown}"
                   HorizontalAlignment="Left"
                   VerticalAlignment="Center"
-                  Margin="5,5,25,5" />
-        <TextBlock Grid.Row="4"
+                  ClickMode="Press"
+                  Margin="5,5,25,5"
+                  Style="{StaticResource ShowDaysAndShowSecondsStyle}" />
+        <TextBlock Grid.Row="5"
                    Text="FractionalSecondsDigitsCount:"
                    VerticalAlignment="Center" />
         <xctk:IntegerUpDown x:Name="_fractionalSecondsDigitsCount"
-                            Grid.Row="4"
+                            Grid.Row="5"
                             Grid.Column="1"
                             Value="{Binding FractionalSecondsDigitsCount, ElementName=_timeSpanUpDown}"
                             Maximum="3"
                             Minimum="0"
                             HorizontalAlignment="Left"
                             Margin="5,5,25,5" />
-        <TextBlock Grid.Row="5"
+        <TextBlock Grid.Row="6"
                    Text="CurrentDateTimePart:"
                    VerticalAlignment="Center" />
         <ComboBox x:Name="_currentDateTimePart"
-                  Grid.Row="5"
+                  Grid.Row="6"
                   Grid.Column="1"
                   SelectedValue="{Binding CurrentDateTimePart, ElementName=_timeSpanUpDown}"
                   SelectedValuePath="Tag"
                   Margin="5,5,25,5"
-                  ToolTip="Must match a DateTimePart of the TimeSpanUpDown" >
+                  ToolTip="Must match a DateTimePart of the TimeSpanUpDown">
           <ComboBoxItem Content="Day"
                         Tag="{x:Static xctk:DateTimePart.Day}" />
           <ComboBoxItem Content="Hour24"
@@ -196,6 +252,7 @@
                            Minimum="-5.00:00:00"
                            ClipValueToMinMax="False"
                            ShowDays="True"
+                           ShowHours="True"
                            ShowSeconds="True"
                            FractionalSecondsDigitsCount="0"
                            CurrentDateTimePart="Hour24"
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 1eff0712..19e866d5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -14,19 +14,6 @@
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   *************************************************************************************/
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.TimeSpan.Views
 {
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 e9f29c4d..e51170ef 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 63e016a7..01d113bc 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 d753d8c8..21983fde 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 f5c70f98..551ea21f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,25 +15,16 @@
 
   ***********************************************************************************/
 
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Windows.Controls;
-using System;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Documents;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.ToggleSwitch.Views
 {
-    /// <summary>
-    /// Interaction logic for ToggleSwitchView.xaml
-    /// </summary>
-    public partial class ToggleSwitchView : DemoView
+  /// <summary>
+  /// Interaction logic for ToggleSwitchView.xaml
+  /// </summary>
+  public partial class ToggleSwitchView : DemoView
+  {
+    public ToggleSwitchView()
     {
-        public ToggleSwitchView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
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 b0b8f46f..e04f7f48 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -22,70 +22,72 @@
                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
                 Title="WatermarkComboBox">
 
-   <local:DemoView.Description>
-      <Paragraph FontSize="14"
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
                  FontFamily="Segoe">
-         <Run>The WatermarkComboBox is a ComboBox with a fully customizable watermark.</Run>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <DataTemplate x:Key="WatermarkComboBoxTemplate1">
-         <Grid>
-            <StackPanel Orientation="Horizontal">
-               <Image Source="..\Resources\PencilTool16.png" />
-               <TextBlock Text="{Binding}"
+      <Run>The WatermarkComboBox is a ComboBox with a fully customizable watermark.</Run>
+    </Paragraph>
+  </local:DemoView.Description>
+
+  <local:DemoView.Resources>
+    <DataTemplate x:Key="WatermarkComboBoxTemplate1">
+      <Grid>
+        <StackPanel Orientation="Horizontal">
+          <Image Source="..\Resources\PencilTool16.png" />
+          <TextBlock Text="{Binding}"
                           Foreground="Green"
                           FontFamily="Sans Serif"
                           FontWeight="Bold"
                           HorizontalAlignment="Center"
                           VerticalAlignment="Center"
                           Margin="4,0,0,0"/>
-            </StackPanel>           
-         </Grid>
-      </DataTemplate>
+        </StackPanel>
+      </Grid>
+    </DataTemplate>
 
-      <DataTemplate x:Key="WatermarkComboBoxTemplate2">
-         <Border BorderBrush="Green"
+    <DataTemplate x:Key="WatermarkComboBoxTemplate2">
+      <Border BorderBrush="Green"
                  BorderThickness="1">
-            <TextBlock Text="{Binding}"
+        <TextBlock Text="{Binding}"
                        Foreground="Red"
                        HorizontalAlignment="Center"
                        VerticalAlignment="Center" />
-         </Border>
-      </DataTemplate>
-   </local:DemoView.Resources>
+      </Border>
+    </DataTemplate>
+  </local:DemoView.Resources>
 
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
 
-      <GroupBox Header="Features"
+    <GroupBox Header="Features"
                 Margin="5">
-         <Grid Margin="5">
-            <Grid.RowDefinitions>
-               <RowDefinition Height="Auto" />
-               <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="Watermark: "
+      <Grid Margin="5">
+        <Grid.RowDefinitions>
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+          <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="*" />
+          <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <TextBlock Text="Watermark: "
                        VerticalAlignment="Center" />
-            <TextBox Grid.Column="1"
+        <TextBox Grid.Column="1"
                      HorizontalAlignment="Stretch"
                      VerticalAlignment="Center"
                      Margin="5"
                      ToolTip="Gets/Sets the watermark when there are no comboBoxItem selected and focus is not on WatermarkComboBox."
                      Text="{Binding Watermark, ElementName=_watermarkComboBox, UpdateSourceTrigger=PropertyChanged}" />
-            <TextBlock Text="WatermarkTemplate: "
+        <TextBlock Text="WatermarkTemplate: "
                        Grid.Row="1"
                        VerticalAlignment="Center" />
-            <ComboBox Grid.Column="1"
+        <ComboBox Grid.Column="1"
                       Grid.Row="1"
                       Width="150"
                       Margin="5"
@@ -93,37 +95,55 @@
                       VerticalAlignment="Center"
                       SelectedValue="{Binding WatermarkTemplate, ElementName=_watermarkComboBox}"
                       SelectedValuePath="Tag">
-               <ComboBoxItem Content="Default"
+          <ComboBoxItem Content="Default"
                              Tag="{x:Null}" />
-               <ComboBoxItem Content="Template 1"
+          <ComboBoxItem Content="Template 1"
                              Tag="{StaticResource WatermarkComboBoxTemplate1}" />
-               <ComboBoxItem Content="Template 2"
+          <ComboBoxItem Content="Template 2"
                              Tag="{StaticResource WatermarkComboBoxTemplate2}" />
-            </ComboBox>
-         </Grid>
-      </GroupBox>
+        </ComboBox>
+        <TextBlock Text="WatermarkBackgound: "
+                       Grid.Row="2"
+                       VerticalAlignment="Center" />
+        <ComboBox Grid.Column="1"
+                      Grid.Row="2"
+                      Width="150"
+                      Margin="5"
+                      HorizontalAlignment="Left"
+                      VerticalAlignment="Center"
+                      SelectedValue="{Binding WatermarkBackground, ElementName=_watermarkComboBox}"
+                      SelectedValuePath="Tag">
+          <ComboBoxItem Content="Default" Tag="{x:Null}" />
+          <ComboBoxItem Foreground="Blue" Tag="Blue" Content="Blue" />
+          <ComboBoxItem Foreground="Orange" Tag="Orange" Content="Orange" />
+          <ComboBoxItem Foreground="Green" Tag="Green" Content="Green" />
+        </ComboBox>
+
+      </Grid>
+    </GroupBox>
 
-      <StackPanel Grid.Row="1"
+    <StackPanel Grid.Row="1"
                   Margin="10">
 
-         <TextBlock Text="Usage:"
+      <TextBlock Text="Usage:"
                     Margin="10"
                     Style="{StaticResource Header}" />
 
-         <xctk:WatermarkComboBox x:Name="_watermarkComboBox"
-                                 Margin="10"
-                                 Width="350"
-                                 IsEditable="True"
-                                 Watermark="Choose a ComboBox Item..."
-                                 WatermarkTemplate="{x:Null}"
-                                 VerticalContentAlignment="Center">
-            <ComboBoxItem Content="Red" />
-            <ComboBoxItem Content="Green" />
-            <ComboBoxItem Content="Blue" />
-            <ComboBoxItem Content="Yellow" />
-            <ComboBoxItem Content="Black" />
-         </xctk:WatermarkComboBox>
-
-      </StackPanel>
-   </Grid>
+      <xctk:WatermarkComboBox x:Name="_watermarkComboBox"
+                              Margin="10"
+                              Width="350"
+                              IsEditable="True"
+                              Watermark="Choose a ComboBox Item..."
+                              WatermarkTemplate="{x:Null}"
+                              WatermarkBackground="{x:Null}"
+                              VerticalContentAlignment="Center">
+        <ComboBoxItem Content="Red" />
+        <ComboBoxItem Content="Green" />
+        <ComboBoxItem Content="Blue" />
+        <ComboBoxItem Content="Yellow" />
+        <ComboBoxItem Content="Black" />
+      </xctk:WatermarkComboBox>
+
+    </StackPanel>
+  </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/WatermarkComboBox/Views/WatermarkComboBoxView.xaml.cs
index 99bdf9dc..c2de9dc5 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,15 +15,6 @@
 
   ***********************************************************************************/
 
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.ComponentModel;
-using System.Windows.Controls;
-using System;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Documents;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.WatermarkComboBox.Views
 {
   /// <summary>
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 41c30bbc..71aeda96 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,8 @@
 
   ************************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Globalization;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters
 {
@@ -27,7 +24,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters
   {
     public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
     {
-      int intReceived = (int)value;
+      int intReceived = ( int )value;
 
       if( intReceived == 1 )
         return false;
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 5ef3960f..087c996d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,12 +15,8 @@
 
   *************************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Globalization;
-using Xceed.Wpf.Toolkit;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters
 {
@@ -28,12 +24,12 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters
   {
     public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
     {
-      return ((WindowState)value == WindowState.Open);
+      return ( ( WindowState )value == WindowState.Open );
     }
 
     public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
     {
-      return (bool)value ? WindowState.Open : WindowState.Closed;
+      return ( bool )value ? WindowState.Open : WindowState.Closed;
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/FancyStyles.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/FancyStyles.xaml
index 0bb93f20..bf14541d 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 40ed0abf..f4a1efb1 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,91 +17,140 @@
 <UserControl x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources.WindowModelEditor"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:conv="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
-             mc:Ignorable="d" 
-             d:DesignHeight="300" d:DesignWidth="300" 
+             mc:Ignorable="d"
+             d:DesignHeight="300"
+             d:DesignWidth="300"
              x:Name="_windowModelEditor">
-   <UserControl.Resources>
-      <conv:VisibilityToBoolConverter x:Key="VisibilityToBoolConverter"/>
-      <conv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-      <conv:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter" />
+  <UserControl.Resources>
+    <conv:VisibilityToBoolConverter x:Key="VisibilityToBoolConverter" />
+    <conv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
+    <conv:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter" />
 
-      <ObjectDataProvider x:Key="WindowStyleComboBoxItemsSource" MethodName="GetValues" ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="WindowStyle" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
+    <ObjectDataProvider x:Key="WindowStyleComboBoxItemsSource"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="WindowStyle" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
 
-   </UserControl.Resources>
-   <StackPanel>
-      <StackPanel.Resources>
-         <Style TargetType="TextBlock">
-            <Setter Property="DockPanel.Dock" Value="Left"/>
-         </Style>
-      </StackPanel.Resources>
-      <DockPanel Margin="0,5,0,5">
-         <TextBlock Text="WindowBackground:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource DisableGrayText}"/>
-         <xctk:ColorPicker IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
-            SelectedColor="{Binding WindowBackground, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="100" Margin="5,0,0,0"/>
-      </DockPanel>
-       <DockPanel Margin="0,5,0,5">
-         <TextBlock Text="WindowInactiveBackground:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource DisableGrayText}"/>
-         <xctk:ColorPicker IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
-            SelectedColor="{Binding WindowInactiveBackground, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="62" Margin="5,0,0,0"/>
-      </DockPanel>
-      <DockPanel Margin="0,5,0,5">
-         <TextBlock Text="WindowBorderBrush:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource DisableGrayText}" />
-         <xctk:ColorPicker IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
-                           SelectedColor="{Binding WindowBorderBrush, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="100" Margin="5,0,0,0"/>
-      </DockPanel>
-      <DockPanel Margin="0,5,0,5">
-         <TextBlock Text="WindowBorderThickness:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource DisableGrayText}" />
-         <xctk:IntegerUpDown IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
-                             Value="{Binding WindowBorderThickness, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}" Minimum="0" Maximum="75" ClipValueToMinMax="True" Margin="5,0,0,0" />
-      </DockPanel>
-      <DockPanel Margin="0,5,0,5">
-         <TextBlock Text="WindowOpacity:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource DisableGrayText}"/>
-         <xctk:DoubleUpDown IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
-                            Value="{Binding WindowOpacity}" Minimum="0" Maximum="1" Increment="0.1" FormatString="N1" ClipValueToMinMax="True" Margin="5,0,0,0"/>
-      </DockPanel>
-      <DockPanel Margin="0,5,0,5">
-         <TextBlock Text="TitleFontSize:"
-                    VerticalAlignment="Center"
-                    IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
-                    Style="{StaticResource DisableGrayText}" />
-         <xctk:DoubleUpDown IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
-                            Value="{Binding TitleFontSize}"
-                            Minimum="5"
-                            Maximum="50"
-                            ClipValueToMinMax="True"
-                            Margin="5,0,0,0" />
-      </DockPanel>
-      <DockPanel Margin="0,5,0,5">
-         <TextBlock Text="TitleForeground:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource DisableGrayText}" />
-         <xctk:ColorPicker IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
-                           SelectedColor="{Binding TitleForeground, Converter={StaticResource SolidColorBrushToColorConverter}}" Margin="5,0,0,0"/>
-      </DockPanel>
-      <DockPanel Margin="0,5,0,5">
-         <TextBlock Text="TitleShadowBrush:" VerticalAlignment="Center" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}" Style="{StaticResource DisableGrayText}" />
-         <xctk:ColorPicker x:Name="_titleShadowBrushColorPicker" IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
-                           SelectedColor="{Binding TitleShadowBrush, Converter={StaticResource SolidColorBrushToColorConverter}}" Margin="5,0,0,0"/>
-      </DockPanel>
-      <DockPanel Margin="0,5,0,5">
-         <TextBlock Text="WindowStyle:" VerticalAlignment="Center" />
-         <ComboBox ItemsSource="{Binding Source={StaticResource WindowStyleComboBoxItemsSource}}" SelectedItem="{Binding WindowStyle}" Width="140" Margin="5,0,0,0"/>
-      </DockPanel>      
-      <DockPanel Margin="0,5,0,5">
-         <TextBlock Text="CloseButtonVisibility:" 
-                    VerticalAlignment="Center" 
-                    ToolTip="Not applicable to MessageBoxes."/>
-         <CheckBox IsChecked="{Binding CloseButtonVisibility, Converter={StaticResource VisibilityToBoolConverter}}" 
-                   Margin="5,0,0,0"
-                   VerticalAlignment="Center"
-                   ToolTip="Not applicable to MessageBoxes."/>
-      </DockPanel>
-   </StackPanel>
+
+  </UserControl.Resources>
+  <StackPanel>
+    <StackPanel.Resources>
+      <Style TargetType="TextBlock">
+        <Setter Property="DockPanel.Dock"
+                Value="Left" />
+      </Style>
+    </StackPanel.Resources>
+    <DockPanel Margin="0,5,0,5">
+      <TextBlock Text="WindowBackground:"
+                 VerticalAlignment="Center"
+                 IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                 Style="{StaticResource DisableGrayText}" />
+      <xctk:ColorPicker IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                        SelectedColor="{Binding WindowBackground, Converter={StaticResource SolidColorBrushToColorConverter}}"
+                        Width="100"
+                        Margin="5,0,0,0" />
+    </DockPanel>
+    <DockPanel Margin="0,5,0,5">
+      <TextBlock Text="WindowInactiveBackground:"
+                 VerticalAlignment="Center"
+                 IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                 Style="{StaticResource DisableGrayText}" />
+      <xctk:ColorPicker IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                        SelectedColor="{Binding WindowInactiveBackground, Converter={StaticResource SolidColorBrushToColorConverter}}"
+                        Width="62"
+                        Margin="5,0,0,0" />
+    </DockPanel>
+    <DockPanel Margin="0,5,0,5">
+      <TextBlock Text="WindowBorderBrush:"
+                 VerticalAlignment="Center"
+                 IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                 Style="{StaticResource DisableGrayText}" />
+      <xctk:ColorPicker IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                        SelectedColor="{Binding WindowBorderBrush, Converter={StaticResource SolidColorBrushToColorConverter}}"
+                        Width="100"
+                        Margin="5,0,0,0" />
+    </DockPanel>
+    <DockPanel Margin="0,5,0,5">
+      <TextBlock Text="WindowBorderThickness:"
+                 VerticalAlignment="Center"
+                 IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                 Style="{StaticResource DisableGrayText}" />
+      <xctk:IntegerUpDown IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                          Value="{Binding WindowBorderThickness, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}"
+                          Minimum="0"
+                          Maximum="75"
+                          ClipValueToMinMax="True"
+                          Margin="5,0,0,0" />
+    </DockPanel>
+    <DockPanel Margin="0,5,0,5">
+      <TextBlock Text="WindowOpacity:"
+                 VerticalAlignment="Center"
+                 IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                 Style="{StaticResource DisableGrayText}" />
+      <xctk:DoubleUpDown IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                         Value="{Binding WindowOpacity}"
+                         Minimum="0"
+                         Maximum="1"
+                         Increment="0.1"
+                         FormatString="N1"
+                         ClipValueToMinMax="True"
+                         Margin="5,0,0,0" />
+    </DockPanel>
+    <DockPanel Margin="0,5,0,5">
+      <TextBlock Text="TitleFontSize:"
+                 VerticalAlignment="Center"
+                 IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                 Style="{StaticResource DisableGrayText}" />
+      <xctk:DoubleUpDown IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                         Value="{Binding TitleFontSize}"
+                         Minimum="5"
+                         Maximum="50"
+                         ClipValueToMinMax="True"
+                         Margin="5,0,0,0" />
+    </DockPanel>
+    <DockPanel Margin="0,5,0,5">
+      <TextBlock Text="TitleForeground:"
+                 VerticalAlignment="Center"
+                 IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                 Style="{StaticResource DisableGrayText}" />
+      <xctk:ColorPicker IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                        SelectedColor="{Binding TitleForeground, Converter={StaticResource SolidColorBrushToColorConverter}}"
+                        Margin="5,0,0,0" />
+    </DockPanel>
+    <DockPanel Margin="0,5,0,5">
+      <TextBlock Text="TitleShadowBrush:"
+                 VerticalAlignment="Center"
+                 IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                 Style="{StaticResource DisableGrayText}" />
+      <xctk:ColorPicker x:Name="_titleShadowBrushColorPicker"
+                        IsEnabled="{Binding IsStyleEnabled, ElementName=_windowModelEditor}"
+                        SelectedColor="{Binding TitleShadowBrush, Converter={StaticResource SolidColorBrushToColorConverter}}"
+                        Margin="5,0,0,0" />
+    </DockPanel>
+    <DockPanel Margin="0,5,0,5">
+      <TextBlock Text="WindowStyle:"
+                 VerticalAlignment="Center" />
+      <ComboBox ItemsSource="{Binding Source={StaticResource WindowStyleComboBoxItemsSource}}"
+                SelectedItem="{Binding WindowStyle}"
+                Width="140"
+                Margin="5,0,0,0" />
+    </DockPanel>
+    <DockPanel Margin="0,5,0,5">
+      <TextBlock Text="CloseButtonVisibility:"
+                 VerticalAlignment="Center"
+                 ToolTip="Not applicable to MessageBoxes." />
+      <CheckBox IsChecked="{Binding CloseButtonVisibility, Converter={StaticResource VisibilityToBoolConverter}}"
+                Margin="5,0,0,0"
+                VerticalAlignment="Center"
+                ToolTip="Not applicable to MessageBoxes." />
+    </DockPanel>
+  </StackPanel>
 </UserControl>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Resources/WindowModelEditor.xaml.cs
index 0d312555..6b0b676c 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,21 +15,9 @@
 
   ************************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Collections.ObjectModel;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Xceed.Wpf.Toolkit;
-using System.Collections.ObjectModel;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources
 {
@@ -58,8 +46,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources
 
     public bool IsStyleEnabled
     {
-      get { return ( bool )GetValue( IsStyleEnabledProperty ); }
-      set { SetValue( IsStyleEnabledProperty, value ); }
+      get
+      {
+        return ( bool )GetValue( IsStyleEnabledProperty );
+      }
+      set
+      {
+        SetValue( IsStyleEnabledProperty, value );
+      }
     }
 
     #endregion //IsStyleEnabled
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 e49be00e..4edb90b7 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 004d3caf..248baf3f 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,6 @@
 
   *************************************************************************************/
 
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
-using System.Diagnostics;
-
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 {
   /// <summary>
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 047dbe33..5aea3ece 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,126 +15,175 @@
 
   **************************************************************************************-->
 <local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views.StyleableWindowView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
-                 xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views"
-                 xmlns:res="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources"
-                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 Title="StyleableWindows" >
-   <local:DemoView.Description>
-      <Paragraph FontSize="14" FontFamily="Segoe">
-         <Run>It is possible to style ChildWindow controls as well as MessageBox controls. All the chrome of their window can be styled (color, thickness, opacity); their action buttons can also be styled.</Run>
-         <LineBreak />
-         <LineBreak />
-         <Run>The "Plus" version provides a new control called StyleableWindow, which consists of a window that has all the functions of a normal window, but which can be styled in the same way as ChildWindow or MessageBox.</Run>
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:view="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views"
+                xmlns:res="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Resources"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                Title="StyleableWindows">
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      <Run>It is possible to style ChildWindow controls as well as MessageBox controls. All the chrome of their window can be styled (color, thickness, opacity); their action buttons can also be styled.</Run>
+      <LineBreak />
+      <LineBreak />
+      <Run>The "Plus" version provides a new control called StyleableWindow, which consists of a window that has all the functions of a normal window, but which can be styled in the same way as ChildWindow or MessageBox.</Run>
             <LineBreak />
             <Hyperlink NavigateUri="https://xceed.com/xceed-toolkit-plus-for-wpf" RequestNavigate="Hyperlink_RequestNavigate">
                Click here for more details about Xceed Toolkit Plus for WPF.
             </Hyperlink>
 
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-      <ResourceDictionary>
-         <ResourceDictionary.MergedDictionaries>
-            <ResourceDictionary Source="/Samples/Window/Resources/FancyStyles.xaml"/>
-         </ResourceDictionary.MergedDictionaries>
-
-         <conv:WindowStateToBoolConverter x:Key="windowStateBoolConv" />
-
-         <!--Base style for ChildWindowStyle and MessageBoxStyle-->
-         <Style x:Key="windowControlStyle" TargetType="{x:Type xctk:WindowControl}">
-            <Setter Property="WindowBackground" Value="{Binding WindowBackground}" />
-            <Setter Property="WindowBorderBrush" Value="{Binding WindowBorderBrush}" />
-            <Setter Property="WindowBorderThickness" Value="{Binding WindowBorderThickness}" />
-            <Setter Property="WindowInactiveBackground" Value="{Binding WindowInactiveBackground}" />
-            <Setter Property="WindowOpacity" Value="{Binding WindowOpacity}" />
-            <Setter Property="CaptionFontSize" Value="{Binding TitleFontSize}" />
-            <Setter Property="CaptionForeground" Value="{Binding TitleForeground}" />
-            <Setter Property="CaptionShadowBrush" Value="{Binding TitleShadowBrush}" />
-            <Setter Property="CloseButtonStyle" Value="{Binding CloseButtonStyle}" />
-         </Style>
-
-         <!--Style for the MessageBox-->
-         <Style x:Key="messageBoxStyle" TargetType="{x:Type xctk:MessageBox}" BasedOn="{StaticResource windowControlStyle}">
-            <Setter Property="ButtonRegionBackground" Value="{StaticResource FancyButtonRegionBackground}" />
-            <Setter Property="OkButtonStyle" Value="{StaticResource FancyButtonStyle}" />
-            <Setter Property="CancelButtonStyle" Value="{StaticResource FancyButtonStyle}" />
-            <Setter Property="YesButtonStyle" Value="{StaticResource FancyButtonStyle}" />
-            <Setter Property="NoButtonStyle" Value="{StaticResource FancyButtonStyle}" />
-         </Style>
-
-      </ResourceDictionary>
-   </local:DemoView.Resources>
-
-
-
-   <local:DemoView.DataContext>
-      <!--A model containing the brushes and other properties was created to share theses values
+    </Paragraph>
+  </local:DemoView.Description>
+
+  <local:DemoView.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="/Samples/Window/Resources/FancyStyles.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+
+      <conv:WindowStateToBoolConverter x:Key="windowStateBoolConv" />
+
+      <!--Base style for ChildWindowStyle and MessageBoxStyle-->
+      <Style x:Key="windowControlStyle"
+             TargetType="{x:Type xctk:WindowControl}">
+        <Setter Property="WindowBackground"
+                Value="{Binding WindowBackground}" />
+        <Setter Property="WindowBorderBrush"
+                Value="{Binding WindowBorderBrush}" />
+        <Setter Property="WindowBorderThickness"
+                Value="{Binding WindowBorderThickness}" />
+        <Setter Property="WindowInactiveBackground"
+                Value="{Binding WindowInactiveBackground}" />
+        <Setter Property="WindowOpacity"
+                Value="{Binding WindowOpacity}" />
+        <Setter Property="CaptionFontSize"
+                Value="{Binding TitleFontSize}" />
+        <Setter Property="CaptionForeground"
+                Value="{Binding TitleForeground}" />
+        <Setter Property="CaptionShadowBrush"
+                Value="{Binding TitleShadowBrush}" />
+        <Setter Property="CloseButtonStyle"
+                Value="{Binding CloseButtonStyle}" />
+      </Style>
+
+      <!--Style for the MessageBox-->
+      <Style x:Key="messageBoxStyle"
+             TargetType="{x:Type xctk:MessageBox}"
+             BasedOn="{StaticResource windowControlStyle}">
+        <Setter Property="ButtonRegionBackground"
+                Value="{StaticResource FancyButtonRegionBackground}" />
+        <Setter Property="OkButtonStyle"
+                Value="{StaticResource FancyButtonStyle}" />
+        <Setter Property="CancelButtonStyle"
+                Value="{StaticResource FancyButtonStyle}" />
+        <Setter Property="YesButtonStyle"
+                Value="{StaticResource FancyButtonStyle}" />
+        <Setter Property="NoButtonStyle"
+                Value="{StaticResource FancyButtonStyle}" />
+      </Style>
+
+    </ResourceDictionary>
+  </local:DemoView.Resources>
+
+
+
+  <local:DemoView.DataContext>
+    <!--A model containing the brushes and other properties was created to share theses values
       between ChildWindow, MessageBox, and StyleableWindow.-->
-      <view:WindowModel
-         WindowBackground="#FFC72035"
-         WindowBorderBrush="Black"
-         WindowBorderThickness="2"
-         WindowInactiveBackground="LightGray"
-         WindowOpacity="0.75"
-         WindowStyle="SingleBorderWindow"
-         TitleForeground="Brown"
-         TitleShadowBrush="White"
-         TitleFontSize="15"
-         ResizeMode="CanResize"
-         CloseButtonVisibility="Visible" 
-         CloseButtonStyle="{StaticResource FancyButtonCloseStyle}"
-         MinimizeButtonStyle="{StaticResource FancyButtonMinimizeStyle}"
-         MaximizeButtonStyle="{StaticResource FancyButtonMaximizeStyle}"
-         RestoreButtonStyle="{StaticResource FancyButtonRestoreStyle}"/>
-   </local:DemoView.DataContext>
-
-   <Grid>
-      <Grid.RowDefinitions>
-         <RowDefinition Height="Auto" />
-         <RowDefinition Height="*" />
-      </Grid.RowDefinitions>
-
-      <StackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
-      </StackPanel>
-
-      <Grid Grid.Row="1">
-         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="Auto" />
-            <ColumnDefinition Width="*"/>
-         </Grid.ColumnDefinitions>
-
-         <GroupBox Header="Features" Margin="5" VerticalAlignment="Stretch">
-            <StackPanel HorizontalAlignment="Center">
-               <StackPanel Orientation="Horizontal" Margin="0,5,0,5">
-                  <TextBlock Text="Show ChildWindow:" VerticalAlignment="Center" Width="120"/>
-                  <CheckBox IsChecked="{Binding WindowState, ElementName=_childWindow, Converter={StaticResource windowStateBoolConv}}"
-                            Margin="5,0,0,0"
-                            VerticalAlignment="Center"/>
-               </StackPanel>
-               <StackPanel Orientation="Horizontal" Margin="0,5,0,25">
-                  <TextBlock Text="Enable Styling:" VerticalAlignment="Center" Width="120"/>
-                  <CheckBox x:Name="_enableStyleCheckBox" IsChecked="True" Margin="5,0,0,0" Click="UpdateWindowsStyles" />
-               </StackPanel>
-               <!--This is a custom control that modifies the underlying model. It is defined elsewhere to avoid cluttering this XAML. -->
-               <res:WindowModelEditor IsStyleEnabled="{Binding ElementName=_enableStyleCheckBox, Path=IsChecked}"/>
-            </StackPanel>
-         </GroupBox>
-
-         <DockPanel Grid.Column="1" Margin="5" >
-            <GroupBox Header="MessageBox" DockPanel.Dock="Top" Margin="5" HorizontalAlignment="Stretch">
-               <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                  <Button Content="Show System MessageBox" Click="StandardMessageBoxButton_Click" Width="150" Height="30" Margin="10"/>
-                  <Button Content="Show Toolkit MessageBox" Click="StyledMessageBoxButton_Click" Margin="10" Width="150" Height="30"/>
-               </StackPanel>
-            </GroupBox>
-            <GroupBox Header="Styleable Window" DockPanel.Dock="Top" Margin="5" HorizontalAlignment="Stretch" >
-               <Button Width="160" Height="30" Margin="10" HorizontalAlignment="Center"
-                       Content="Show" Click="OnStyleableWindow_Click" >
+    <view:WindowModel WindowBackground="#FFC72035"
+                      WindowBorderBrush="Black"
+                      WindowBorderThickness="2"
+                      WindowInactiveBackground="LightGray"
+                      WindowOpacity="0.75"
+                      WindowStyle="SingleBorderWindow"
+                      TitleForeground="Brown"
+                      TitleShadowBrush="White"
+                      TitleFontSize="15"
+                      ResizeMode="CanResize"
+                      CloseButtonVisibility="Visible"
+                      CloseButtonStyle="{StaticResource FancyButtonCloseStyle}"
+                      MinimizeButtonStyle="{StaticResource FancyButtonMinimizeStyle}"
+                      MaximizeButtonStyle="{StaticResource FancyButtonMaximizeStyle}"
+                      RestoreButtonStyle="{StaticResource FancyButtonRestoreStyle}" />
+  </local:DemoView.DataContext>
+
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
+
+    <StackPanel Orientation="Horizontal"
+                HorizontalAlignment="Stretch">
+    </StackPanel>
+
+    <Grid Grid.Row="1">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="Auto" />
+        <ColumnDefinition Width="*" />
+      </Grid.ColumnDefinitions>
+
+      <GroupBox Header="Features"
+                Margin="5"
+                VerticalAlignment="Stretch">
+        <StackPanel HorizontalAlignment="Center">
+          <StackPanel Orientation="Horizontal"
+                      Margin="0,5,0,5">
+            <TextBlock Text="Show ChildWindow:"
+                       VerticalAlignment="Center"
+                       Width="120" />
+            <CheckBox IsChecked="{Binding WindowState, ElementName=_childWindow, Converter={StaticResource windowStateBoolConv}}"
+                      Margin="5,0,0,0"
+                      VerticalAlignment="Center" />
+          </StackPanel>
+          <StackPanel Orientation="Horizontal"
+                      Margin="0,5,0,25">
+            <TextBlock Text="Enable Styling:"
+                       VerticalAlignment="Center"
+                       Width="120" />
+            <CheckBox x:Name="_enableStyleCheckBox"
+                      IsChecked="True"
+                      Margin="5,0,0,0"
+                      Click="UpdateWindowsStyles" />
+          </StackPanel>
+          <!--This is a custom control that modifies the underlying model. It is defined elsewhere to avoid cluttering this XAML. -->
+          <res:WindowModelEditor IsStyleEnabled="{Binding ElementName=_enableStyleCheckBox, Path=IsChecked}" />
+        </StackPanel>
+      </GroupBox>
+
+      <DockPanel Grid.Column="1"
+                 Margin="5">
+        <GroupBox Header="MessageBox"
+                  DockPanel.Dock="Top"
+                  Margin="5"
+                  HorizontalAlignment="Stretch">
+          <StackPanel Orientation="Horizontal"
+                      HorizontalAlignment="Center">
+            <Button Content="Show System MessageBox"
+                    Click="StandardMessageBoxButton_Click"
+                    Width="150"
+                    Height="30"
+                    Margin="10" />
+            <Button Content="Show Toolkit MessageBox"
+                    Click="StyledMessageBoxButton_Click"
+                    Margin="10"
+                    Width="150"
+                    Height="30" />
+          </StackPanel>
+        </GroupBox>
+        <GroupBox Header="Styleable Window"
+                  DockPanel.Dock="Top"
+                  Margin="5"
+                  HorizontalAlignment="Stretch">
+          <Button Width="160"
+                  Height="30"
+                  Margin="10"
+                  HorizontalAlignment="Center"
+                  Content="Show"
+                  Click="OnStyleableWindow_Click">
                   <Button.ContentTemplate>
                      <DataTemplate>
                         <StackPanel Orientation="Horizontal">
@@ -146,27 +195,30 @@
                         </StackPanel>
                      </DataTemplate>
                   </Button.ContentTemplate>
-               </Button>
-            </GroupBox>
-            <GroupBox Header="ChildWindow" Margin="5">
-               <Border BorderThickness="1" 
-                        BorderBrush="Black" >
-                  <xctk:WindowContainer >
-                     <xctk:ChildWindow x:Name="_childWindow" Width="325" Height="100"
-                                    Caption="Toolkit for WPF ChildWindow"
-                                    WindowStartupLocation="Center"
-                                    IsModal="True"
-                                    WindowState="Open" 
-                                    CloseButtonVisibility="{Binding CloseButtonVisibility}"
-                                    WindowStyle="{Binding WindowStyle}" >
-                        <TextBlock>
+          </Button>
+        </GroupBox>
+        <GroupBox Header="ChildWindow"
+                  Margin="5">
+          <Border BorderThickness="1"
+                  BorderBrush="Black">
+            <xctk:WindowContainer>
+              <xctk:ChildWindow x:Name="_childWindow"
+                                Width="325"
+                                Height="100"
+                                Caption="Toolkit for WPF ChildWindow"
+                                WindowStartupLocation="Center"
+                                IsModal="True"
+                                WindowState="Open"
+                                CloseButtonVisibility="{Binding CloseButtonVisibility}"
+                                WindowStyle="{Binding WindowStyle}">
+                <TextBlock>
                            This is the content of the child window.
-                        </TextBlock>
-                     </xctk:ChildWindow>
-                  </xctk:WindowContainer>
-               </Border>
-            </GroupBox>
-         </DockPanel>
-      </Grid>
-   </Grid>
+                </TextBlock>
+              </xctk:ChildWindow>
+            </xctk:WindowContainer>
+          </Border>
+        </GroupBox>
+      </DockPanel>
+    </Grid>
+  </Grid>
 </local:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/StyleableWindowView.xaml.cs
index 379ab694..12091dda 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,22 +15,9 @@
 
   *************************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-using Xceed.Wpf.Toolkit;
-using System.ComponentModel;
-using System.Diagnostics;
-using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 {
@@ -53,7 +40,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
     public StyleableWindowView()
     {
       InitializeComponent();
-      this.UpdateWindowsStyles(null,null);
+      this.UpdateWindowsStyles( null, null );
     }
 
 
@@ -81,7 +68,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
       msgBox.DataContext = this.DataContext;
       msgBox.Text = StyledMsgBoxMessage;
       msgBox.Caption = StyledMsgBoxTitle;
-      if( _enableStyleCheckBox.IsChecked.GetValueOrDefault() ) 
+      if( _enableStyleCheckBox.IsChecked.GetValueOrDefault() )
       {
         msgBox.Style = ( Style )this.Resources[ MessageBoxStyleKey ];
       }
@@ -117,8 +104,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Brush WindowBackground
     {
-      get { return ( Brush )GetValue( WindowBackgroundProperty ); }
-      set { SetValue( WindowBackgroundProperty, value ); }
+      get
+      {
+        return ( Brush )GetValue( WindowBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WindowBackgroundProperty, value );
+      }
     }
 
     #endregion //WindowBackground
@@ -149,12 +142,21 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Brush WindowBorderBrush
     {
-      get { return ( Brush )GetValue( WindowBorderBrushProperty ); }
-      set { SetValue( WindowBorderBrushProperty, value ); }
+      get
+      {
+        return ( Brush )GetValue( WindowBorderBrushProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderBrushProperty, value );
+      }
     }
 
     #endregion //WindowBorderBrush
 
+
+
+
     #region TitleFontSize
 
     public static readonly DependencyProperty TitleFontSizeProperty =
@@ -164,7 +166,7 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
     {
       get
       {
-        return (double)GetValue( TitleFontSizeProperty );
+        return ( double )GetValue( TitleFontSizeProperty );
       }
       set
       {
@@ -181,8 +183,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Brush TitleForeground
     {
-      get { return ( Brush )GetValue( TitleForegroundProperty ); }
-      set { SetValue( TitleForegroundProperty, value ); }
+      get
+      {
+        return ( Brush )GetValue( TitleForegroundProperty );
+      }
+      set
+      {
+        SetValue( TitleForegroundProperty, value );
+      }
     }
 
     #endregion //TitleForeground
@@ -213,8 +221,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Thickness WindowBorderThickness
     {
-      get { return ( Thickness )GetValue( WindowBorderThicknessProperty ); }
-      set { SetValue( WindowBorderThicknessProperty, value ); }
+      get
+      {
+        return ( Thickness )GetValue( WindowBorderThicknessProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderThicknessProperty, value );
+      }
     }
 
     #endregion //WindowBorderThickness
@@ -226,8 +240,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public double WindowOpacity
     {
-      get { return ( double )GetValue( WindowOpacityProperty ); }
-      set { SetValue( WindowOpacityProperty, value ); }
+      get
+      {
+        return ( double )GetValue( WindowOpacityProperty );
+      }
+      set
+      {
+        SetValue( WindowOpacityProperty, value );
+      }
     }
 
     #endregion //WindowOpacity
@@ -239,8 +259,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public WindowStyle WindowStyle
     {
-      get { return ( WindowStyle )GetValue( WindowStyleProperty ); }
-      set { SetValue( WindowStyleProperty, value ); }
+      get
+      {
+        return ( WindowStyle )GetValue( WindowStyleProperty );
+      }
+      set
+      {
+        SetValue( WindowStyleProperty, value );
+      }
     }
 
     #endregion //WindowStyle
@@ -252,8 +278,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public ResizeMode ResizeMode
     {
-      get { return ( ResizeMode )GetValue( ResizeModeProperty ); }
-      set { SetValue( ResizeModeProperty, value ); }
+      get
+      {
+        return ( ResizeMode )GetValue( ResizeModeProperty );
+      }
+      set
+      {
+        SetValue( ResizeModeProperty, value );
+      }
     }
 
     #endregion //ResizeMode
@@ -264,8 +296,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Visibility CloseButtonVisibility
     {
-      get { return ( Visibility )GetValue( CloseButtonVisibilityProperty ); }
-      set { SetValue( CloseButtonVisibilityProperty, value ); }
+      get
+      {
+        return ( Visibility )GetValue( CloseButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonVisibilityProperty, value );
+      }
     }
     #endregion //CloseButtonVisibility
 
@@ -275,8 +313,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Style CloseButtonStyle
     {
-      get { return ( Style )GetValue( CloseButtonStyleProperty ); }
-      set { SetValue( CloseButtonStyleProperty, value ); }
+      get
+      {
+        return ( Style )GetValue( CloseButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonStyleProperty, value );
+      }
     }
     #endregion //CloseButtonStyle
 
@@ -286,8 +330,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Style MinimizeButtonStyle
     {
-      get { return ( Style )GetValue( MinimizeButtonStyleProperty ); }
-      set { SetValue( MinimizeButtonStyleProperty, value ); }
+      get
+      {
+        return ( Style )GetValue( MinimizeButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( MinimizeButtonStyleProperty, value );
+      }
     }
     #endregion //MinimizeButtonStyle
 
@@ -297,8 +347,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Style MaximizeButtonStyle
     {
-      get { return ( Style )GetValue( MaximizeButtonStyleProperty ); }
-      set { SetValue( MaximizeButtonStyleProperty, value ); }
+      get
+      {
+        return ( Style )GetValue( MaximizeButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( MaximizeButtonStyleProperty, value );
+      }
     }
     #endregion //MaximizeButtonStyle
 
@@ -308,8 +364,14 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 
     public Style RestoreButtonStyle
     {
-      get { return ( Style )GetValue( RestoreButtonStyleProperty ); }
-      set { SetValue( RestoreButtonStyleProperty, value ); }
+      get
+      {
+        return ( Style )GetValue( RestoreButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( RestoreButtonStyleProperty, value );
+      }
     }
     #endregion //RestoreButtonStyle
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml
index 5edab9fe..d9b33db3 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,146 +15,223 @@
 
   ************************************************************************************-->
 <local:DemoView x:Class="Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views.WindowContainerView"
-                 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                 xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
-                 xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:sys="clr-namespace:System;assembly=mscorlib"
-                 xmlns:xctkconv="http://schemas.xceed.com/wpf/xaml/toolkit"
-                 xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
-                 xmlns:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views"
-                 Title="WindowContainer">
-   <local:DemoView.Description>
-      <Paragraph FontSize="14" FontFamily="Segoe">
-         <Run>WindowContainer can be used to provide an area where a window-like control can be displayed. This is particularly useful in an XBAP application, where windows can't be popped up.</Run>
-         <LineBreak/>
-         <LineBreak />         
-         <Run>ChildWindow or MessageBox controls can be added and constrained in a WindowContainer. When a child of the WindowContainer is modal (modal ChildWindow or MessageBox), the background color of the WindowContainer can be set.</Run>
-         <LineBreak/>
-         <LineBreak />
-         <Run>In WindowContainer, the modal windows (modal ChildWindow or MesssageBox) will always be in front, preventing the use of other windows from the WindowContainer.</Run>
-      </Paragraph>
-   </local:DemoView.Description>
-
-   <local:DemoView.Resources>
-        <xctkconv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
-        <conv:WindowStateToBoolConverter x:Key="WindowStateToBoolConverter" />
-
-        <ObjectDataProvider x:Key="GenderEnum" MethodName="GetValues"
-                          ObjectType="{x:Type sys:Enum}">
-         <ObjectDataProvider.MethodParameters>
-            <x:Type TypeName="sample:GenderData" />
-         </ObjectDataProvider.MethodParameters>
-      </ObjectDataProvider>
-    </local:DemoView.Resources>
-
-    <Grid>
-        <Grid.RowDefinitions>
-             <RowDefinition Height="Auto" />
-             <RowDefinition Height="*" />
-       </Grid.RowDefinitions>
-
-       <GroupBox Header="Features" Grid.Row="0" Margin="5">
-         <Grid Margin="5">
-            <Grid.ColumnDefinitions>
-               <ColumnDefinition Width="Auto" />
-               <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Text="ModalBackgroundBrush:" VerticalAlignment="Center" />
-            <xctk:ColorPicker x:Name="_modalBackgroundColorPicker" Grid.Column="1" SelectedColor="{Binding ModalBackgroundBrush, ElementName=_windowContainer, Converter={StaticResource SolidColorBrushToColorConverter}}" Width="100" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5"/>
-         </Grid>
-      </GroupBox>
-
-       <Grid Grid.Row="1" Margin="10"
+                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                xmlns:local="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer"
+                xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:sys="clr-namespace:System;assembly=mscorlib"
+                xmlns:xctkconv="http://schemas.xceed.com/wpf/xaml/toolkit"
+                xmlns:conv="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Converters"
+                xmlns:sample="clr-namespace:Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views"
+                Title="WindowContainer">
+  <local:DemoView.Description>
+    <Paragraph FontSize="14"
+               FontFamily="Segoe">
+      <Run>WindowContainer can be used to provide an area where a window-like control can be displayed. This is particularly useful in an XBAP application, where windows can't be popped up.</Run>
+      <LineBreak />
+      <LineBreak />
+      <Run>ChildWindow or MessageBox controls can be added and constrained in a WindowContainer. When a child of the WindowContainer is modal (modal ChildWindow or MessageBox), the background color of the WindowContainer can be set.</Run>
+      <LineBreak />
+      <LineBreak />
+      <Run>In WindowContainer, the modal windows (modal ChildWindow or MesssageBox) will always be in front, preventing the use of other windows from the WindowContainer.</Run>
+    </Paragraph>
+  </local:DemoView.Description>
+
+  <local:DemoView.Resources>
+    <xctkconv:SolidColorBrushToColorConverter x:Key="SolidColorBrushToColorConverter" />
+    <conv:WindowStateToBoolConverter x:Key="WindowStateToBoolConverter" />
+
+    <ObjectDataProvider x:Key="GenderEnum"
+                        MethodName="GetValues"
+                        ObjectType="{x:Type sys:Enum}">
+      <ObjectDataProvider.MethodParameters>
+        <x:Type TypeName="sample:GenderData" />
+      </ObjectDataProvider.MethodParameters>
+    </ObjectDataProvider>
+  </local:DemoView.Resources>
+
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="Auto" />
+      <RowDefinition Height="*" />
+    </Grid.RowDefinitions>
+
+    <GroupBox Header="Features"
+              Grid.Row="0"
+              Margin="5">
+      <Grid Margin="5">
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <TextBlock Text="ModalBackgroundBrush:"
+                   VerticalAlignment="Center" />
+        <xctk:ColorPicker x:Name="_modalBackgroundColorPicker"
+                          Grid.Column="1"
+                          SelectedColor="{Binding ModalBackgroundBrush, ElementName=_windowContainer, Converter={StaticResource SolidColorBrushToColorConverter}}"
+                          Width="100"
+                          HorizontalAlignment="Left"
+                          VerticalAlignment="Center"
+                          Margin="5" />
+      </Grid>
+    </GroupBox>
+
+    <Grid Grid.Row="1"
+          Margin="10"
           TextElement.Foreground="{DynamicResource {x:Static SystemColors.ActiveCaptionTextBrushKey}}">
-           <Grid.RowDefinitions>
-             <RowDefinition Height="Auto" />
-             <RowDefinition Height="*" />
+      <Grid.RowDefinitions>
+        <RowDefinition Height="Auto" />
+        <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="Usage:"
+                 Style="{StaticResource Header}" />
+
+      <Grid Grid.Row="1">
+        <Grid.ColumnDefinitions>
+          <ColumnDefinition Width="Auto" />
+          <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+
+        <StackPanel>
+          <CheckBox x:Name="_childWindowCheckBox"
+                    Content="Child Window"
+                    Margin="5"
+                    IsChecked="{Binding WindowState, ElementName=_childWindow, Converter={StaticResource WindowStateToBoolConverter}}" />
+          <CheckBox x:Name="_modalChildWindowCheckBox"
+                    Content="Modal Child Window"
+                    Margin="5"
+                    IsChecked="{Binding WindowState, ElementName=_modalChildWindow, Converter={StaticResource WindowStateToBoolConverter}}" />
+          <CheckBox x:Name="_messageBoxCheckBox"
+                    Content="MessageBox"
+                    Margin="5"
+                    Checked="OnMessageBoxCheckBoxChecked"
+                    Unchecked="OnMessageBoxCheckBoxUnchecked" />
+        </StackPanel>
+
+        <Grid Column="1">
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="80" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="80" />
+            <ColumnDefinition />
+          </Grid.ColumnDefinitions>
+          <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition />
+            <RowDefinition />
           </Grid.RowDefinitions>
 
-          <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-
-          <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-
-            <StackPanel>
-                <CheckBox x:Name="_childWindowCheckBox" Content="Child Window" Margin="5" IsChecked="{Binding WindowState, ElementName=_childWindow, Converter={StaticResource WindowStateToBoolConverter}}" />
-                <CheckBox x:Name="_modalChildWindowCheckBox" Content="Modal Child Window" Margin="5" IsChecked="{Binding WindowState, ElementName=_modalChildWindow, Converter={StaticResource WindowStateToBoolConverter}}" />
-                <CheckBox x:Name="_messageBoxCheckBox" Content="MessageBox" Margin="5" Checked="OnMessageBoxCheckBoxChecked" Unchecked="OnMessageBoxCheckBoxUnchecked" />
-            </StackPanel>
-
-            <Grid Column="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="80" />
-                    <ColumnDefinition />
-                    <ColumnDefinition Width="80" />
-                    <ColumnDefinition />
-                </Grid.ColumnDefinitions>
-                <Grid.RowDefinitions>
-                    <RowDefinition />
-                    <RowDefinition />
-                    <RowDefinition />
-                </Grid.RowDefinitions>
-
-                <!--1st Column -->
-                <TextBlock Text="First Name:" VerticalAlignment="Center" Margin="10"/>
-                <TextBox Grid.Column="1" Text="Michael" Width="150" Height="30" HorizontalAlignment="Left"/>
-                <TextBlock Grid.Row="1" Text="Last Name:" VerticalAlignment="Center" Margin="10"/>
-                <TextBox Grid.Row="1" Grid.Column="1" Width="150" Height="30" Text="Thompson" HorizontalAlignment="Left"/>
-                <TextBlock Grid.Row="2" Text="Address:" VerticalAlignment="Center" Margin="10"/>
-                <TextBox Grid.Row="2" Grid.Column="1" Width="150" Height="30" Text="65 Main street" HorizontalAlignment="Left"/>
-
-                <!-- 2nd Column-->
-                <TextBlock Grid.Column="2" Text="Gender:" VerticalAlignment="Center" Margin="10"/>
-                <ComboBox Grid.Column="3" Width="100" Height="30" ItemsSource="{Binding Source={StaticResource GenderEnum}}" SelectedIndex="0" Margin="5" HorizontalAlignment="Left"/>
-                <TextBlock Grid.Row="1" Grid.Column="2" Text="Job Title:" VerticalAlignment="Center" Margin="10"/>
-                <TextBox Grid.Row="1" Grid.Column="3" Width="100"  Height="30"  Text="Plumber" Margin="5" HorizontalAlignment="Left"/>
-                <TextBlock Grid.Row="2" Grid.Column="2" Text="Salary:" VerticalAlignment="Center" Margin="10"/>
-                <xctk:IntegerUpDown Grid.Row="2" Width="100" Grid.Column="3" Height="30" Value="30000" Increment="5000" Margin="5" HorizontalAlignment="Left"/>
-            </Grid>
-
-            <Border Grid.Column="1"
-                    BorderBrush="Black"
-                    BorderThickness="2"
-                    Margin="5,0,0,0">
-
-               <xctk:WindowContainer x:Name="_windowContainer" 
-                                     ModalBackgroundBrush="#80000000">
-                  <xctk:ChildWindow x:Name="_childWindow" 
-                                  Caption="Modaless ChildWindow"
-                                  Left="75"
-                                  Top="50"
-                                  Width="275"
-                                  Height="125"
-                                  WindowState="Open">
-                        <TextBlock Text="This is a regular Child Window" Padding="10"/>
-                </xctk:ChildWindow>
-
-                  <xctk:ChildWindow x:Name="_modalChildWindow" 
-                                  Caption="Modal ChildWindow"
-                                  IsModal="True"
-                                  Left="175"
-                                  Top="125"
-                                  Width="275"
-                                  Height="125"
-                                  WindowState="Open">
-                        <TextBlock Text="This is a modal Child Window" Padding="10"/>
-                </xctk:ChildWindow>
-
-                  <xctk:MessageBox x:Name="_messageBox"
-                                 Caption="MessageBox" 
-                                 Text="This is a MessageBox, always modal"
-                                 Closed="OnMessageBoxClose" />
-               </xctk:WindowContainer>
-
-            </Border>
+          <!--1st Column -->
+          <TextBlock Text="First Name:"
+                     VerticalAlignment="Center"
+                     Margin="10" />
+          <TextBox Grid.Column="1"
+                   Text="Michael"
+                   Width="150"
+                   Height="30"
+                   HorizontalAlignment="Left" />
+          <TextBlock Grid.Row="1"
+                     Text="Last Name:"
+                     VerticalAlignment="Center"
+                     Margin="10" />
+          <TextBox Grid.Row="1"
+                   Grid.Column="1"
+                   Width="150"
+                   Height="30"
+                   Text="Thompson"
+                   HorizontalAlignment="Left" />
+          <TextBlock Grid.Row="2"
+                     Text="Address:"
+                     VerticalAlignment="Center"
+                     Margin="10" />
+          <TextBox Grid.Row="2"
+                   Grid.Column="1"
+                   Width="150"
+                   Height="30"
+                   Text="65 Main street"
+                   HorizontalAlignment="Left" />
+
+          <!-- 2nd Column-->
+          <TextBlock Grid.Column="2"
+                     Text="Gender:"
+                     VerticalAlignment="Center"
+                     Margin="10" />
+          <ComboBox Grid.Column="3"
+                    Width="100"
+                    Height="30"
+                    ItemsSource="{Binding Source={StaticResource GenderEnum}}"
+                    SelectedIndex="0"
+                    Margin="5"
+                    HorizontalAlignment="Left" />
+          <TextBlock Grid.Row="1"
+                     Grid.Column="2"
+                     Text="Job Title:"
+                     VerticalAlignment="Center"
+                     Margin="10" />
+          <TextBox Grid.Row="1"
+                   Grid.Column="3"
+                   Width="100"
+                   Height="30"
+                   Text="Plumber"
+                   Margin="5"
+                   HorizontalAlignment="Left" />
+          <TextBlock Grid.Row="2"
+                     Grid.Column="2"
+                     Text="Salary:"
+                     VerticalAlignment="Center"
+                     Margin="10" />
+          <xctk:IntegerUpDown Grid.Row="2"
+                              Width="100"
+                              Grid.Column="3"
+                              Height="30"
+                              Value="30000"
+                              Increment="5000"
+                              Margin="5"
+                              HorizontalAlignment="Left" />
         </Grid>
+
+        <Border Grid.Column="1"
+                BorderBrush="Black"
+                BorderThickness="2"
+                Margin="5,0,0,0">
+
+          <xctk:WindowContainer x:Name="_windowContainer"
+                                ModalBackgroundBrush="#80000000">
+            <xctk:ChildWindow x:Name="_childWindow"
+                              Caption="Modaless ChildWindow"
+                              Left="75"
+                              Top="50"
+                              Width="275"
+                              Height="125"
+                              WindowState="Open">
+              <TextBlock Text="This is a regular Child Window"
+                         Padding="10" />
+            </xctk:ChildWindow>
+
+            <xctk:ChildWindow x:Name="_modalChildWindow"
+                              Caption="Modal ChildWindow"
+                              IsModal="True"
+                              Left="175"
+                              Top="125"
+                              Width="275"
+                              Height="125"
+                              WindowState="Open">
+              <TextBlock Text="This is a modal Child Window"
+                         Padding="10" />
+            </xctk:ChildWindow>
+
+            <xctk:MessageBox x:Name="_messageBox"
+                             Caption="MessageBox"
+                             Text="This is a MessageBox, always modal"
+                             Closed="OnMessageBoxClose" />
+          </xctk:WindowContainer>
+
+        </Border>
       </Grid>
     </Grid>
+  </Grid>
 
 </local:DemoView>
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Samples/Window/Views/WindowContainerView.xaml.cs
index 2f05ab47..f3bca0c8 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,19 +16,14 @@
   ************************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
-using Xceed.Wpf.Toolkit;
 using System.Collections.ObjectModel;
+using System.Windows;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Window.Views
 {
   public enum GenderData
   {
-    Male = 0, 
+    Male = 0,
     Female
   }
 
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 28ec6a48..7b79049a 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 a24cfab5..1671ae31 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,7 +15,6 @@
 
   *************************************************************************************/
 
-using System.Windows;
 using System;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Wizard.Views
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 88f70d10..fc86d1d3 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   *************************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters
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 a131f82b..ad808b43 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -14,10 +14,6 @@
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   *************************************************************************************/
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters
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 7a696bd4..a1f0663c 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   *************************************************************************************/
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters
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 a86d551e..46521c44 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -14,10 +14,6 @@
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   *************************************************************************************/
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters
 {
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 951c780e..d6c7fd09 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -14,10 +14,6 @@
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   *************************************************************************************/
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters
 {
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 a47be61b..b82e5393 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -14,10 +14,6 @@
    Stay informed: follow @datagrid on Twitter or Like http://facebook.com/datagrids
 
   ************************************************************************************/
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters
 {
@@ -27,5 +23,5 @@ namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Converters
     {
       return ( ( int )value ) - 1;
     }
-  }  
+  }
 }
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 6bfbbc55..a2cb6828 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 c59b2fc6..aeefc099 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-2021 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,8 @@
 
   *************************************************************************************/
 
-using System.Windows.Controls;
-using System.Windows.Data;
-using System;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace Xceed.Wpf.Toolkit.LiveExplorer.Samples.Zoombox.Views
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.NET5.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.NET5.csproj
new file mode 100644
index 00000000..ff5b6918
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.NET5.csproj
@@ -0,0 +1,1415 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>obj\net5\</BaseIntermediateOutputPath>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>Xceed.Wpf.Toolkit.LiveExplorer</RootNamespace>
+    <AssemblyName>Xceed.Wpf.Toolkit.LiveExplorer.NET5</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+    <ApplicationIcon>App.ico</ApplicationIcon>
+    <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NET5</DefineConstants>
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;NET5</DefineConstants>
+    <DebugType>none</DebugType>
+    <DebugSymbols>False</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Compile Include="CodeBox.cs" />
+    <Compile Include="Core\Converters\ZeroToBoolConverter.cs" />
+    <Compile Include="Core\CSharpFormatter.cs" />
+    <Compile Include="Core\XamlFormatter.cs" />
+    <Compile Include="HomeView.xaml.cs">
+      <DependentUpon>HomeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\AvalonDock\Resources\Document.cs" />
+    <Compile Include="Samples\AvalonDock\Resources\DocumentBase.cs" />
+    <Compile Include="Samples\AvalonDock\Resources\DocumentView.xaml.cs" />
+    <Compile Include="Samples\AvalonDock\Resources\Note.cs" />
+    <Compile Include="Samples\AvalonDock\Resources\NoteView.xaml.cs" />
+    <Compile Include="Samples\AvalonDock\Resources\Page.cs" />
+    <Compile Include="Samples\AvalonDock\Resources\PageView.xaml.cs" />
+    <Compile Include="Samples\AvalonDock\Views\AvalonDockPropertiesView.xaml.cs" />
+    <Compile Include="Samples\AvalonDock\Views\AvalonDockSourcesView.xaml.cs" />
+    <Compile Include="Samples\AvalonDock\Views\AvalonDockView.xaml.cs">
+      <DependentUpon>AvalonDockView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\BusyIndicator\Converters\IntegerToTimespanConverter.cs" />
+    <Compile Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml.cs">
+      <DependentUpon>BusyIndicatorCustomContentTemplateView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml.cs">
+      <DependentUpon>BusyIndicatorCustomContentView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\BusyIndicator\Views\BusyIndicatorView.xaml.cs">
+      <DependentUpon>BusyIndicatorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Button\Views\IconButtonView.xaml.cs">
+      <DependentUpon>IconButtonView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Button\Views\ButtonSpinnerView.xaml.cs">
+      <DependentUpon>ButtonSpinnerView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Button\Views\DropDownSplitButtonView.xaml.cs">
+      <DependentUpon>DropDownSplitButtonView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Calculator\Views\CalculatorView.xaml.cs">
+      <DependentUpon>CalculatorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Converters\GraduationModeToComboBoxConverter.cs" />
+    <Compile Include="Samples\Chart\Views\ChartAxisView.xaml.cs">
+      <DependentUpon>ChartAxisView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartLegendView.xaml.cs">
+      <DependentUpon>ChartLegendView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartSeriesBasicTypesView.xaml.cs">
+      <DependentUpon>ChartSeriesBasicTypesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml.cs">
+      <DependentUpon>ChartSeriesDataPointsBindingView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartStylingAxesGridView.xaml.cs">
+      <DependentUpon>ChartStylingAxesGridView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartStylingColumnSeriesView.xaml.cs">
+      <DependentUpon>ChartStylingColumnSeriesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartStylingLineSeriesView.xaml.cs">
+      <DependentUpon>ChartStylingLineSeriesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Chart\Views\ChartStylingPieSeriesView.xaml.cs">
+      <DependentUpon>ChartStylingPieSeriesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\CheckLists\Views\CheckListsView.xaml.cs">
+      <DependentUpon>CheckListsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Color\Views\ColorView.xaml.cs">
+      <DependentUpon>ColorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\DataGrid\Converters\FlagPathConverter.cs" />
+    <Compile Include="Samples\DataGrid\Views\DataGridView.xaml.cs">
+      <DependentUpon>DataGridView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\DataGrid\Views\MultiColumnComboBoxView.xaml.cs">
+      <DependentUpon>MultiColumnComboBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\DateTime\Converters\CustomFormatToBoolConverter.cs" />
+    <Compile Include="Samples\DateTime\Converters\DateTimeToTimeSpanConverter.cs" />
+    <Compile Include="Samples\DateTime\Views\DateTimeView.xaml.cs">
+      <DependentUpon>DateTimeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\ExtTabControl\Views\ExtTabControlView.xaml.cs">
+      <DependentUpon>ExtTabControlView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\FilePicker\Views\FilePickerView.xaml.cs">
+      <DependentUpon>FilePickerView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Gauge\Views\RadialGaugeView.xaml.cs">
+      <DependentUpon>RadialGaugeView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\ListBox\Converters\BoxArtImageSourceConverter.cs" />
+    <Compile Include="Samples\ListBox\Views\ListBoxView.xaml.cs">
+      <DependentUpon>ListBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Magnifier\Converters\ColorConverter.cs" />
+    <Compile Include="Samples\Magnifier\Converters\VisibilityConverter.cs" />
+    <Compile Include="Samples\Magnifier\Views\MagnifierView.xaml.cs">
+      <DependentUpon>MagnifierView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Converters\EqualsMinusOneConverter.cs" />
+    <Compile Include="Samples\MaterialControls\Data\RequiredRule.cs" />
+    <Compile Include="Samples\MaterialControls\Views\MaterialHamburgerView.xaml.cs">
+      <DependentUpon>MaterialHamburgerView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialComboBoxView.xaml.cs">
+      <DependentUpon>MaterialComboBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialDemoView.cs" />
+    <Compile Include="Samples\MaterialControls\Views\MaterialListBoxView.xaml.cs">
+      <DependentUpon>MaterialListBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialToolTipView.xaml.cs">
+      <DependentUpon>MaterialToolTipView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialDropDownView.xaml.cs">
+      <DependentUpon>MaterialDropDownView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialSwitchView.xaml.cs">
+      <DependentUpon>MaterialSwitchView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialFrameView.xaml.cs">
+      <DependentUpon>MaterialFrameView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialTabsView.xaml.cs">
+      <DependentUpon>MaterialTabsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml.cs">
+      <DependentUpon>MaterialProgressBarCircularView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialProgressBarView.xaml.cs">
+      <DependentUpon>MaterialProgressBarView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialRadioButtonView.xaml.cs">
+      <DependentUpon>MaterialRadioButtonView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialCheckBoxView.xaml.cs">
+      <DependentUpon>MaterialCheckBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialToastView.xaml.cs">
+      <DependentUpon>MaterialToastView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialSliderView.xaml.cs">
+      <DependentUpon>MaterialSliderView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialTextFieldView.xaml.cs">
+      <DependentUpon>MaterialTextFieldView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialButtonView.xaml.cs">
+      <DependentUpon>MaterialButtonView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MaterialControls\Views\MaterialControlsView.xaml.cs">
+      <DependentUpon>MaterialControlsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\MultiCalendar\Views\MultiCalendarView.xaml.cs">
+      <DependentUpon>MultiCalendarView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Numeric\Views\NumericView.xaml.cs">
+      <DependentUpon>NumericView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Panels\Converters\ComboBoxToVisibilityConverter.cs" />
+    <Compile Include="Samples\Panels\Views\SwitchPanelView.xaml.cs">
+      <DependentUpon>SwitchPanelView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Pie\Converters\SliceLabelConverter.cs" />
+    <Compile Include="Samples\Pie\Views\PieChartView.xaml.cs">
+      <DependentUpon>PieChartView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Pie\Views\PieProgressView.xaml.cs">
+      <DependentUpon>PieProgressView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Pie\Views\PieView.xaml.cs">
+      <DependentUpon>PieView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PileFlowPanel\Converters\FullNameStringConverter.cs" />
+    <Compile Include="Samples\PileFlowPanel\Views\PileFlowPanelView.xaml.cs">
+      <DependentUpon>PileFlowPanelView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Converters\DimensionConverter.cs" />
+    <Compile Include="Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml.cs">
+      <DependentUpon>LastNameUserControlEditor.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridAdvancedContextMenuView.xaml.cs" />
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs" />
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml.cs">
+      <DependentUpon>PropertyGridPropertyItemStyleView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml.cs">
+      <DependentUpon>PropertyGridDefinitionKeyView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml.cs">
+      <DependentUpon>PropertyGridEditorDefinitionsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml.cs">
+      <DependentUpon>PropertyGridAttributesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml.cs">
+      <DependentUpon>PropertyGridSelectedObjectView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml.cs">
+      <DependentUpon>PropertyGridCustomPropertyView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml.cs">
+      <DependentUpon>PropertyGridPropertiesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml.cs">
+      <DependentUpon>PropertyGridPropertiesSourceView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\DisplayLocalizationRes.Designer.cs">
+      <DependentUpon>DisplayLocalizationRes.resx</DependentUpon>
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml.cs">
+      <DependentUpon>PropertyGridBindingToStructsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml.cs">
+      <DependentUpon>PropertyGridCategoryOrderView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml.cs">
+      <DependentUpon>PropertyGridCustomEditorsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml.cs">
+      <DependentUpon>PropertyGridDefaultEditorsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml.cs">
+      <DependentUpon>PropertyGridDisplayLocalizationView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml.cs">
+      <DependentUpon>PropertyGridMultiSelectedObjectsView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml.cs">
+      <DependentUpon>PropertyGridSpecifyingPropertiesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml.cs">
+      <DependentUpon>PropertyGridExpandingNonPrimitivesView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\PropertyGrid\Views\PropertyGridView.xaml.cs">
+      <DependentUpon>PropertyGridView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\RangeSlider\Converters\AbsoluteAdditionConverter.cs" />
+    <Compile Include="Samples\RangeSlider\Converters\RangeSliderEnabledConverter.cs" />
+    <Compile Include="Samples\RangeSlider\Views\RangeSliderView.xaml.cs">
+      <DependentUpon>RangeSliderView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Rating\Views\RatingView.xaml.cs">
+      <DependentUpon>RatingView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\SlideShow\Views\SlideShowView.xaml.cs">
+      <DependentUpon>SlideShowView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Text\Views\AutoSelectTextboxView.xaml.cs">
+      <DependentUpon>AutoSelectTextboxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Text\Views\MaskedTextboxView.xaml.cs">
+      <DependentUpon>MaskedTextboxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Text\Views\MultiLineTextEditorView.xaml.cs">
+      <DependentUpon>MultiLineTextEditorView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Text\Views\RichTextboxView.xaml.cs">
+      <DependentUpon>RichTextboxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Text\Views\WatermarkPasswordBoxView.xaml.cs">
+      <DependentUpon>WatermarkPasswordBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Text\Views\WatermarkTextboxView.xaml.cs">
+      <DependentUpon>WatermarkTextboxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Theming\Converters\FlagPathConverter.cs" />
+    <Compile Include="Samples\Theming\Views\ThemingAvalonDockView.xaml.cs">
+      <DependentUpon>ThemingAvalonDockView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Theming\Views\ThemingCoreWPFView.xaml.cs">
+      <DependentUpon>ThemingCoreWPFView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Theming\Views\ThemingDataGridView.xaml.cs">
+      <DependentUpon>ThemingDataGridView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Theming\Views\ThemingExtendedToolkitView.xaml.cs">
+      <DependentUpon>ThemingExtendedToolkitView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Theming\Views\ThemingListBoxView.xaml.cs">
+      <DependentUpon>ThemingListBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\TimelinePanel\Views\TimelinePanelView.xaml.cs">
+      <DependentUpon>TimelinePanelView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\TimeSpan\Views\TimeSpanView.xaml.cs">
+      <DependentUpon>TimeSpanView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\ToggleSwitch\Views\ToggleSwitchView.xaml.cs">
+      <DependentUpon>ToggleSwitchView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Text\Views\TokenizedTextBoxView.xaml.cs">
+      <DependentUpon>TokenizedTextBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml.cs">
+      <DependentUpon>WatermarkComboBoxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Window\Converters\IntToBoolConverter.cs" />
+    <Compile Include="Samples\Window\Converters\WindowStateToBoolConverter.cs" />
+    <Compile Include="Samples\Window\Resources\WindowModelEditor.xaml.cs">
+      <DependentUpon>WindowModelEditor.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Window\Views\ChildWindowView.xaml.cs">
+      <DependentUpon>ChildWindowView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Window\Views\StyleableWindowView.xaml.cs">
+      <DependentUpon>StyleableWindowView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Window\Views\WindowContainerView.xaml.cs">
+      <DependentUpon>WindowContainerView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Wizard\Views\WizardView.xaml.cs">
+      <DependentUpon>WizardView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Samples\Zoombox\Converters\PointConverter.cs" />
+    <Compile Include="Samples\Zoombox\Converters\RectConverter.cs" />
+    <Compile Include="Samples\Zoombox\Converters\SimpleConverter.cs" />
+    <Compile Include="Samples\Zoombox\Converters\ViewFinderConverter.cs" />
+    <Compile Include="Samples\Zoombox\Converters\ViewNameConverter.cs" />
+    <Compile Include="Samples\Zoombox\Converters\ViewStackCountConverter.cs" />
+    <Compile Include="Samples\Zoombox\Views\ZoomboxView.xaml.cs">
+      <DependentUpon>ZoomboxView.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Service References\NorthwindDataService\Reference.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Reference.datasvcmap</DependentUpon>
+    </Compile>
+    <Page Include="HomeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Core\CodeFormatting\CSharpFormat.cs" />
+    <Compile Include="Core\CodeFormatting\XamlFormat.cs" />
+    <Compile Include="Core\LiveExplorerTreeViewItem.cs" />
+    <Compile Include="DemoView.cs" />
+    <Compile Include="MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Page Include="Resources\LiveExplorerScrollViewer.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Resources\TextBlockStyles.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\AvalonDock\Resources\DocumentView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\AvalonDock\Resources\NoteView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\AvalonDock\Resources\PageView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\AvalonDock\Views\AvalonDockPropertiesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\AvalonDock\Views\AvalonDockSourcesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\AvalonDock\Views\AvalonDockView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\BusyIndicator\Resources\Common.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\BusyIndicator\Views\BusyIndicatorView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Button\Views\IconButtonView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Button\Views\ButtonSpinnerView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Button\Views\DropDownSplitButtonView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Calculator\Views\CalculatorView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartAxisView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartLegendView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartSeriesBasicTypesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartStylingAxesGridView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartStylingColumnSeriesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartStylingLineSeriesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Chart\Views\ChartStylingPieSeriesView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\CheckLists\Views\CheckListsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Color\Views\ColorView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\DataGrid\Views\DataGridView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\DataGrid\Views\MultiColumnComboBoxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\DateTime\Views\DateTimeView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\ExtTabControl\Views\ExtTabControlView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\FilePicker\Views\FilePickerView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Gauge\Views\RadialGaugeView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\ListBox\Views\ListBoxView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Magnifier\Views\MagnifierView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Resources\CommonResources.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialHamburgerView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialComboBoxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialListBoxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialToolTipView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialDropDownView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialSwitchView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialFrameView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialTabsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialProgressBarView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialRadioButtonView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialCheckBoxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialToastView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialSliderView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialTextFieldView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialButtonView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MaterialControls\Views\MaterialControlsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\MultiCalendar\Views\MultiCalendarView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Numeric\Views\NumericView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Panels\Views\SwitchPanelView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Pie\Views\PieChartView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Pie\Views\PieProgressView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Pie\Views\PieView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PileFlowPanel\Views\PileFlowPanelView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridAdvancedContextMenuView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridEditorComboBoxDefinitionSourceView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\PropertyGrid\Views\PropertyGridView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\RangeSlider\Views\RangeSliderView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Rating\Views\RatingView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\SlideShow\Views\SlideShowView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Text\Views\AutoSelectTextboxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Text\Views\MaskedTextboxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Text\Views\MultiLineTextEditorView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Text\Views\RichTextboxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Text\Views\WatermarkPasswordBoxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Text\Views\WatermarkTextboxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Theming\ItemTemplates\Common.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Theming\Views\ThemingAvalonDockView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Theming\Views\ThemingCoreWPFView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Theming\Views\ThemingDataGridView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Theming\Views\ThemingExtendedToolkitView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Theming\Views\ThemingListBoxView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\TimelinePanel\Views\TimelinePanelView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\TimeSpan\Views\TimeSpanView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\ToggleSwitch\Views\ToggleSwitchView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Text\Views\TokenizedTextBoxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Window\Resources\FancyStyles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Window\Resources\WindowModelEditor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Window\Views\ChildWindowView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Window\Views\StyleableWindowView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Window\Views\WindowContainerView.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Samples\Wizard\Views\WizardView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Samples\Zoombox\Views\ZoomboxView.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Samples\PropertyGrid\Views\DisplayLocalizationRes.fr.resx">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Samples\PropertyGrid\Views\DisplayLocalizationRes.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>DisplayLocalizationRes.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <None Include="Properties\app.manifest">
+      <SubType>Designer</SubType>
+    </None>
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+    <AppDesigner Include="Properties\" />
+    <Resource Include="CodeFiles\PropertyGridAdvancedContextMenuView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridAdvancedContextMenuView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridEditorComboBoxDefinitionSourceView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridEditorComboBoxDefinitionSourceView.xaml.txt" />
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\EditorComboBoxDefinition.png" />
+    <Resource Include="CodeFiles\AvalonDockPropertiesView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\AvalonDockPropertiesView.xaml.txt" />
+    <Resource Include="CodeFiles\AvalonDockSourcesView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\AvalonDockSourcesView.xaml.txt" />
+    <None Include="Service References\NorthwindDataService\service.edmx" />
+    <Resource Include="Samples\Magnifier\Resources\SampleText.rtf" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\BusyIndicator\Images\CdBurning32.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\NoPicture.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\NoPictureA.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\NoPictureB.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\NoPictureC.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\NoPictureD.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\Working.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Zoombox\Resources\Default.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Zoombox\Resources\ZoomboxProperties.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Window\Resources\xceed_icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\DataGrid\OpenSourceImages\MultiColumnsComboBox.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Panels\OpenSourceImages\AnimatedTimelinePanel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\AutoStretchStackPanel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\CameraPanel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\Canvas.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\Carousel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\DockPanel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\Grid.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\PerspectivePanel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\RadialCanvas.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\RelativeCanvas.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\StackedStackPanel.png" />
+    <Resource Include="Samples\Panels\OpenSourceImages\StackPanel.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\OpenSourceImages\ExtendedWPFToolkitControls.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\OpenSourceImages\CoreWPFControls.png" />
+    <Resource Include="Samples\Theming\OpenSourceImages\DataGridControls.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\Localization.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\MultiSelectedObjects.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartAxis.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartBasicTypes.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartLegend.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartSeriesDataPointsBinding.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartStylingAxesGrid.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartStylingColumnSeries.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartStylingLineSeries.png" />
+    <Resource Include="Samples\Chart\OpenSourceImages\ChartStylingPieSeries.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\AvalonDock\Images\address-book--pencil.png" />
+    <Resource Include="Samples\AvalonDock\Images\address-book-open.png" />
+    <Resource Include="Samples\AvalonDock\Images\alarm-clock-blue.png" />
+    <Resource Include="Samples\AvalonDock\Images\document.png" />
+    <Resource Include="Samples\AvalonDock\Images\property-blue.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PileFlowPanel\OpenSourceImages\PileFlowPanel.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\ListBox\Resources\Netflix_icon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\Resources\woman.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\OpenSourceImages\ListBoxControls.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\ListBox\OpenSourceImages\ListBox.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\EditorDefinitions.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\DefinitionKey.cs.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\DefinitionKey.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\PropertiesSource.cs.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\PropertiesSource.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\Properties.cs.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\Properties.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\CustomProperty.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="App.ico" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Chart\Photo\1.bmp" />
+    <Resource Include="Samples\Chart\Photo\2.bmp" />
+    <Resource Include="Samples\Chart\Photo\3.bmp" />
+    <Resource Include="Samples\Chart\Photo\4.bmp" />
+    <Resource Include="Samples\Chart\Photo\5.bmp" />
+    <Resource Include="Samples\Chart\Photo\6.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Text\Resources\PencilTool16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Service References\" />
+  </ItemGroup>
+  <ItemGroup>
+    <ServiceReferenceMetadataStorage Include="Service References\NorthwindDataService\">
+      <Type>datasvcmap</Type>
+    </ServiceReferenceMetadataStorage>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Service References\NorthwindDataService\Reference.datasvcmap">
+      <Generator>DataServiceClientGenerator</Generator>
+      <LastGenOutput>Reference.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Data.Services.Client" Version="5.8.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\AutoSelectTextboxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\AutoSelectTextboxView.xaml.txt" />
+    <Resource Include="CodeFiles\AvalonDockView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\AvalonDockView.xaml.txt" />
+    <Resource Include="CodeFiles\BusyIndicatorCustomContentTemplateView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\BusyIndicatorCustomContentTemplateView.xaml.txt" />
+    <Resource Include="CodeFiles\BusyIndicatorCustomContentView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\BusyIndicatorCustomContentView.xaml.txt" />
+    <Resource Include="CodeFiles\BusyIndicatorView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\BusyIndicatorView.xaml.txt" />
+    <Resource Include="CodeFiles\ButtonSpinnerView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ButtonSpinnerView.xaml.txt" />
+    <Resource Include="CodeFiles\CalculatorView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\CalculatorView.xaml.txt" />
+    <Resource Include="CodeFiles\ChartAxisView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ChartAxisView.xaml.txt" />
+    <Resource Include="CodeFiles\ChartLegendView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ChartLegendView.xaml.txt" />
+    <Resource Include="CodeFiles\ChartSeriesBasicTypesView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ChartSeriesBasicTypesView.xaml.txt" />
+    <Resource Include="CodeFiles\ChartSeriesDataPointsBindingView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ChartSeriesDataPointsBindingView.xaml.txt" />
+    <Resource Include="CodeFiles\ChartStylingAxesGridView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ChartStylingAxesGridView.xaml.txt" />
+    <Resource Include="CodeFiles\ChartStylingColumnSeriesView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ChartStylingColumnSeriesView.xaml.txt" />
+    <Resource Include="CodeFiles\ChartStylingLineSeriesView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ChartStylingLineSeriesView.xaml.txt" />
+    <Resource Include="CodeFiles\ChartStylingPieSeriesView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ChartStylingPieSeriesView.xaml.txt" />
+    <Resource Include="CodeFiles\CheckListsView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\CheckListsView.xaml.txt" />
+    <Resource Include="CodeFiles\ChildWindowView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ChildWindowView.xaml.txt" />
+    <Resource Include="CodeFiles\ColorView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ColorView.xaml.txt" />
+    <Resource Include="CodeFiles\DataGridView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\DataGridView.xaml.txt" />
+    <Resource Include="CodeFiles\DateTimeView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\DateTimeView.xaml.txt" />
+    <Resource Include="CodeFiles\DisplayLocalizationRes.Designer.cs.txt" />
+    <Resource Include="CodeFiles\DropDownSplitButtonView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\DropDownSplitButtonView.xaml.txt" />
+    <Resource Include="CodeFiles\ListBoxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ListBoxView.xaml.txt" />
+    <Resource Include="CodeFiles\MagnifierView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MagnifierView.xaml.txt" />
+    <Resource Include="CodeFiles\MaskedTextboxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaskedTextboxView.xaml.txt" />
+    <Resource Include="CodeFiles\MultiColumnComboBoxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MultiColumnComboBoxView.xaml.txt" />
+    <Resource Include="CodeFiles\MultiLineTextEditorView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MultiLineTextEditorView.xaml.txt" />
+    <Resource Include="CodeFiles\NumericView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\NumericView.xaml.txt" />
+    <Resource Include="CodeFiles\PieChartView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PieChartView.xaml.txt" />
+    <Resource Include="CodeFiles\PieProgressView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PieProgressView.xaml.txt" />
+    <Resource Include="CodeFiles\PieView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PieView.xaml.txt" />
+    <Resource Include="CodeFiles\PileFlowPanelView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PileFlowPanelView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridAttributesView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridAttributesView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridBindingToStructsView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridBindingToStructsView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridCategoryOrderView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridCategoryOrderView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridCustomEditorsView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridCustomEditorsView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridCustomPropertyView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridCustomPropertyView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridDefaultEditorsView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridDefaultEditorsView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridDefinitionKeyView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridDefinitionKeyView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridDisplayLocalizationView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridDisplayLocalizationView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridEditorDefinitionsView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridEditorDefinitionsView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridMultiSelectedObjectsView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridMultiSelectedObjectsView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridPropertiesSourceView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridPropertiesSourceView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridPropertiesView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridPropertiesView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridPropertyItemStyleView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridPropertyItemStyleView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridSelectedObjectView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridSelectedObjectView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridSpecifyingPropertiesView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridSpecifyingPropertiesView.xaml.txt" />
+    <Resource Include="CodeFiles\PropertyGridView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridView.xaml.txt" />
+    <Resource Include="CodeFiles\RichTextboxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\RichTextboxView.xaml.txt" />
+    <Resource Include="CodeFiles\SwitchPanelView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\SwitchPanelView.xaml.txt" />
+    <Resource Include="CodeFiles\ThemingCoreWPFView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ThemingCoreWPFView.xaml.txt" />
+    <Resource Include="CodeFiles\ThemingDataGridView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ThemingDataGridView.xaml.txt" />
+    <Resource Include="CodeFiles\ThemingExtendedToolkitView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ThemingExtendedToolkitView.xaml.txt" />
+    <Resource Include="CodeFiles\ThemingListBoxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ThemingListBoxView.xaml.txt" />
+    <Resource Include="CodeFiles\TimelinePanelView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\TimelinePanelView.xaml.txt" />
+    <Resource Include="CodeFiles\WatermarkTextboxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\WatermarkTextboxView.xaml.txt" />
+    <Resource Include="CodeFiles\WindowContainerView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\WindowContainerView.xaml.txt" />
+    <Resource Include="CodeFiles\WizardView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\WizardView.xaml.txt" />
+    <Resource Include="CodeFiles\ZoomboxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ZoomboxView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\address-book--pencil.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\property-blue.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\address-book-open.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\alarm-clock-blue.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\Images\document.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\ThemingAvalonDockView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ThemingAvalonDockView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\OpenSourceImages\AvalonDockMetroDark.png" />
+    <Resource Include="Samples\Theming\OpenSourceImages\AvalonDockMetroLight.png" />
+    <Resource Include="Samples\Theming\OpenSourceImages\AvalonDockOffice2007Black.png" />
+    <Resource Include="Samples\Theming\OpenSourceImages\AvalonDockOffice2007Blue.png" />
+    <Resource Include="Samples\Theming\OpenSourceImages\AvalonDockOffice2007Silver.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\RadialGaugeView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\RadialGaugeView.xaml.txt" />
+    <Resource Include="CodeFiles\RangeSliderView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\RangeSliderView.xaml.txt" />
+    <Resource Include="CodeFiles\RatingView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\RatingView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Gauge\Resources\fuel.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Gauge\Resources\pointing.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Gauge\Resources\arrow.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Gauge\Resources\smiley.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\TimeSpanView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\TimeSpanView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\ToggleSwitchView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ToggleSwitchView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Gauge\OpenSourceImages\Gauge.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Rating\OpenSourceImages\Rating.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\TokenizedTextBoxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\TokenizedTextBoxView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\ToggleSwitch\OpenSourceImages\ToggleSwitch.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Text\OpenSourceImages\TokenizedTextBox.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\StyleableWindowView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\StyleableWindowView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\FilePickerView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\FilePickerView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\SlideShowView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\SlideShowView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\FilePicker\OpenSourceImages\FilePicker.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\WatermarkComboBoxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\WatermarkComboBoxView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\WatermarkComboBox\Resources\PencilTool16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\SlideShow\Resources\photo_1.jpg" />
+    <Resource Include="Samples\SlideShow\Resources\photo_2.jpg" />
+    <Resource Include="Samples\SlideShow\Resources\photo_3.jpg" />
+    <Resource Include="Samples\SlideShow\Resources\photo_4.jpg" />
+    <Resource Include="Samples\SlideShow\Resources\photo_5.jpg" />
+    <Resource Include="Samples\SlideShow\Resources\photo_6.jpg" />
+    <Resource Include="Samples\SlideShow\Resources\photo_7.jpg" />
+    <Resource Include="Samples\SlideShow\Resources\photo_8.jpg" />
+    <Resource Include="Samples\SlideShow\Resources\photo_9.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\SlideShow\OpenSourceImages\SlideShow.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MaterialControlsView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialControlsView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\MaterialControls\Resources\WhitePen.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MaterialButtonView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialButtonView.xaml.txt" />
+    <Resource Include="CodeFiles\MaterialSliderView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialSliderView.xaml.txt" />
+    <Resource Include="CodeFiles\MaterialTextFieldView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialTextFieldView.xaml.txt" />
+    <Resource Include="CodeFiles\MaterialToastView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialToastView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MaterialCheckBoxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialCheckBoxView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\MaterialControls\Resources\building16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\MaterialControls\Resources\PencilTool16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MaterialRadioButtonView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialRadioButtonView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MaterialProgressBarCircularView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialProgressBarCircularView.xaml.txt" />
+    <Resource Include="CodeFiles\MaterialProgressBarView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialProgressBarView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MaterialTabsView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialTabsView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MaterialFrameView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialFrameView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MaterialSwitchView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialSwitchView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MaterialDropDownView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialDropDownView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MaterialToolTipView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialToolTipView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MaterialListBoxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialListBoxView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\ToggleSwitch\Resources\PencilTool16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialButton.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialCheckBox.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialControls.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialDropDown.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialFrame.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialListBox.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialProgressBar.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialProgressBarCircular.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialRadioButton.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialSlider.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialSwitch.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialTabs.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialTextField.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialToast.png" />
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialToolTip.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\MaterialControls\Resources\italy.4.gif" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MaterialComboBoxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialComboBoxView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialComboBox.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\WatermarkPasswordBoxView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\WatermarkPasswordBoxView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\MultiCalendar\Resources\April.jpg" />
+    <Resource Include="Samples\MultiCalendar\Resources\December.jpg" />
+    <Resource Include="Samples\MultiCalendar\Resources\February.jpg" />
+    <Resource Include="Samples\MultiCalendar\Resources\July.jpg" />
+    <Resource Include="Samples\MultiCalendar\Resources\June.jpg" />
+    <Resource Include="Samples\MultiCalendar\Resources\March.jpg" />
+    <Resource Include="Samples\MultiCalendar\Resources\October.jpg" />
+    <Resource Include="Samples\MultiCalendar\Resources\September.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MultiCalendarView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MultiCalendarView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\MultiCalendar\OpenSourceImages\MultiCalendar.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\toolkitIcon.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\PropertyGridExpandingNonPrimitivesView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\PropertyGridExpandingNonPrimitivesView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\PropertyGrid\OpenSourceImages\ExpandingNonPrimitives.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Theming\OpenSourceImages\AvalonDockWindows10.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\MaterialHamburgerView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\MaterialHamburgerView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\IconButtonView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\IconButtonView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Button\Resources\PencilTool16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\Button\Resources\Default.jpg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\MaterialControls\Resources\Business.png" />
+    <Resource Include="Samples\MaterialControls\Resources\DataGrid.png" />
+    <Resource Include="Samples\MaterialControls\Resources\SFTP.png" />
+    <Resource Include="Samples\MaterialControls\Resources\Toolkit.png" />
+    <Resource Include="Samples\MaterialControls\Resources\Zip.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialHamburger.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CodeFiles\ExtTabControlView.xaml.cs.txt" />
+    <Resource Include="CodeFiles\ExtTabControlView.xaml.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\ExtTabControl\OpenSourceImages\ExtTabControl.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Samples\DataGrid\OpenSourceImages\DataGrid.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero.NET5.dll">
+      <HintPath>..\Xceed.Wpf.AvalonDock.Themes.Aero\bin\$(Configuration)\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Aero.NET5.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro.NET5.dll">
+      <HintPath>..\Xceed.Wpf.AvalonDock.Themes.Metro\bin\$(Configuration)\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.Metro.NET5.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.dll">
+      <HintPath>..\Xceed.Wpf.AvalonDock.Themes.VS2010\bin\$(Configuration)\net5.0-windows\Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.NET5.dll">
+      <HintPath>..\Xceed.Wpf.AvalonDock\bin\$(Configuration)\net5.0-windows\Xceed.Wpf.AvalonDock.NET5.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.Toolkit.NET5.dll">
+      <HintPath>..\Xceed.Wpf.Toolkit\bin\$(Configuration)\net5.0-windows\Xceed.Wpf.Toolkit.NET5.dll</HintPath>
+    </Reference>
+    <Reference Include="..\..\Libs\Xceed.Wpf.Samples.SampleData.dll" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <!-- .NET Core projects use a custom AssemblySearchPaths value that doesn't
+         include the ReferencePath property. No good reason why. We reactivate its use here
+    -->
+    <AssemblySearchPaths>$(ReferencePath);$(AssemblySearchPaths)</AssemblySearchPaths>
+    <PreBuildEvent>echo Deleting old CodeFiles directory...
+@if exist "$(ProjectDir)CodeFiles" rmdir /s /q "$(ProjectDir)CodeFiles"
+echo Copying sample code files...
+for /d /r "$(ProjectDir)Samples" %25%25a in (Views) do @if exist "%25%25a" xcopy "%25%25a" "$(ProjectDir)CodeFiles" /s /Y /I /q &gt; NUL
+echo Renaming sample code files...
+for /f "tokens=*" %25%25f in ('dir "$(ProjectDir)CodeFiles\*.*" /b') do ( 
+move /y "$(ProjectDir)CodeFiles\%25%25f" "$(ProjectDir)CodeFiles\%25%25f.txt" &gt; NUL
+)
+</PreBuildEvent>
+  </PropertyGroup>
+</Project>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
index 6081ec77..e544904e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfo.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -22,9 +22,9 @@
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string BaseVersion = "4.3";
+  public const string BaseVersion = "4.4";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
-  public const string Version = BaseVersion + 
+  public const string Version = BaseVersion +
   ".0.0";
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]
   public const string PublicKeyToken = "ba83ff368b7563c6";
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
index 187d94f9..444032b7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AssemblyVersionInfoCommon.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
index 18fb8ac9..446d3140 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectBehaviorEnum.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Xceed.Wpf.Toolkit
 {
   public enum AutoSelectBehavior
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
index ba46040c..e35c1568 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/AutoSelectTextBox.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
index 2d493a85..640125e2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/AutoSelectTextBox/Implementation/QueryMoveFocusEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
index 0c326fe0..a220d7bc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/BusyIndicator.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs
index f998f74e..2e10c86e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/Converters/ProgressBarWidthConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
index cf587a37..8937711d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 1c98d00d..212e050a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
index 0f4ae898..9054902d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/BusyIndicator/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
index 6effc495..0c9dd3c0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ButtonSpinner.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
index 7d889198..dcd2bda5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinDirection.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
index 1d8ebdda..151b01dd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/SpinEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
index b7f1b6c0..e21338f7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/Spinner.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
index 65b51072..474e7ab6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Implementation/ValidSpinDirections.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 d1a2a074..1cc150b1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
index 36705b9e..fa46432e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ButtonSpinner/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
index 0873a846..d92542c1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/Calculator.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -102,7 +102,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (ControlTemplate)GetValue( CalculatorButtonPanelTemplateProperty );
+        return ( ControlTemplate )GetValue( CalculatorButtonPanelTemplateProperty );
       }
       set
       {
@@ -309,7 +309,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region Methods
 
-    internal void InitializeToValue(decimal? value)
+    internal void InitializeToValue( decimal? value )
     {
       _previousValue = 0;
       _lastOperation = Operation.None;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
index 8d6a967e..4fbeb7a8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Implementation/CalculatorCommands.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 699b15ca..8571ab49 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
index 99e4cfec..e34d8b98 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Calculator/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
index 0c0d3328..7669ec6f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Implementation/CalculatorUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -64,7 +64,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (object)GetValue( DropDownButtonContentProperty );
+        return ( object )GetValue( DropDownButtonContentProperty );
       }
       set
       {
@@ -81,7 +81,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (object)GetValue( DropDownButtonDisabledContentProperty );
+        return ( object )GetValue( DropDownButtonDisabledContentProperty );
       }
       set
       {
@@ -98,7 +98,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (double)GetValue( DropDownButtonHeightProperty );
+        return ( double )GetValue( DropDownButtonHeightProperty );
       }
       set
       {
@@ -115,7 +115,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (double)GetValue( DropDownButtonWidthProperty );
+        return ( double )GetValue( DropDownButtonWidthProperty );
       }
       set
       {
@@ -314,7 +314,7 @@ namespace Xceed.Wpf.Toolkit
           {
             if( this.UpdateValueOnEnterKey )
             {
-              this.TextBox.Text = (_initialValue != null) ? _initialValue.Value.ToString( this.FormatString, this.CultureInfo ) : null;
+              this.TextBox.Text = ( _initialValue != null ) ? _initialValue.Value.ToString( this.FormatString, this.CultureInfo ) : null;
             }
             else
             {
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 7531bda6..1bf63061 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
index 06966862..745c6812 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CalculatorUpDown/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
index 7a11a088..ef7ea19f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Implementation/CheckComboBox.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -68,7 +68,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (bool)GetValue( IsEditableProperty );
+        return ( bool )GetValue( IsEditableProperty );
       }
       set
       {
@@ -98,7 +98,7 @@ namespace Xceed.Wpf.Toolkit
     {
       var checkComboBox = o as CheckComboBox;
       if( checkComboBox != null )
-        checkComboBox.OnTextChanged( (string)e.OldValue, (string)e.NewValue );
+        checkComboBox.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
     }
 
     protected virtual void OnTextChanged( string oldValue, string newValue )
@@ -264,8 +264,8 @@ namespace Xceed.Wpf.Toolkit
     private void Popup_Opened( object sender, EventArgs e )
     {
       UIElement item = ItemContainerGenerator.ContainerFromItem( SelectedItem ) as UIElement;
-      if( (item == null) && (Items.Count > 0) )
-        item = ItemContainerGenerator.ContainerFromItem( Items[0] ) as UIElement;
+      if( ( item == null ) && ( Items.Count > 0 ) )
+        item = ItemContainerGenerator.ContainerFromItem( Items[ 0 ] ) as UIElement;
       if( item != null )
         item.Focus();
     }
@@ -310,6 +310,12 @@ namespace Xceed.Wpf.Toolkit
 
     protected virtual void UpdateText()
     {
+      if( Items.Count == SelectedItems.Count )
+      {
+        SetCurrentValue( CheckComboBox.TextProperty, AllItemsSelectedContent );
+        return;
+      }
+
 #if VS2008
       string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemDisplayValue( x ).ToString() ).ToArray() ); 
 #else
@@ -398,6 +404,6 @@ namespace Xceed.Wpf.Toolkit
         Focus();
     }
 
-#endregion //Methods
+    #endregion //Methods
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
index 197e8cf5..a1c25151 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
index 336ff751..9c0e5ea4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckComboBox/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
index f108f9c1..9d0d622d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Implementation/CheckListBox.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 f46cd19a..e32d8904 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
index ac1f2e39..4b8d5b49 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CheckListBox/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
index 6d7f6bd5..db7d6561 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/ChildWindow.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -344,7 +344,10 @@ namespace Xceed.Wpf.Toolkit
 
     internal override bool AllowPublicIsActiveChange
     {
-      get { return false; }
+      get
+      {
+        return false;
+      }
     }
 
     public override void OnApplyTemplate()
@@ -461,7 +464,7 @@ namespace Xceed.Wpf.Toolkit
           e.Handled = true;
         }
         // Prevent Tab when no children
-        else if( (e.Key == Key.Tab) && !_hasChildren )
+        else if( ( e.Key == Key.Tab ) && !_hasChildren )
         {
           e.Handled = true;
         }
@@ -633,7 +636,7 @@ namespace Xceed.Wpf.Toolkit
       if( _parentContainer != null )
       {
         _parentContainer.LayoutUpdated -= ParentContainer_LayoutUpdated;
-        _parentContainer.SizeChanged -= ParentContainer_SizeChanged;        
+        _parentContainer.SizeChanged -= ParentContainer_SizeChanged;
 
         //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore
         //we need to handle the loaded event and reposition the window.
@@ -661,7 +664,7 @@ namespace Xceed.Wpf.Toolkit
 
     private void ChildWindow_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
     {
-      if( (bool)e.NewValue && this.IsModal )
+      if( ( bool )e.NewValue && this.IsModal )
       {
         this.Focus();
       }
@@ -683,7 +686,7 @@ namespace Xceed.Wpf.Toolkit
       if( Left < 0 )
         return 0;
 
-      if( ( _parentContainer != null ) && (_windowRoot != null) )
+      if( ( _parentContainer != null ) && ( _windowRoot != null ) )
       {
         if( Left + _windowRoot.ActualWidth > _parentContainer.ActualWidth && _parentContainer.ActualWidth != 0 )
         {
@@ -763,7 +766,7 @@ namespace Xceed.Wpf.Toolkit
 
       if( !_hasWindowContainer )
         if( WindowStartupLocation == Xceed.Wpf.Toolkit.WindowStartupLocation.Center )
-          CenterChildWindow(); 
+          CenterChildWindow();
 
       if( !_hasWindowContainer )
         BringToFront();
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
index 4f563f56..c98d20a4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowStartupLocation.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
index 6ea7ed4e..f070dc87 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Implementation/WindowState.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
index cb190e53..e45e5244 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
index 5349057d..580b84a5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ChildWindow/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
index dfc6abef..4af9244e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Implementation/ButtonChrome.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
index 5789c9b1..3bacba23 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
index bfd4d8ea..b10fab79 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Chromes/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
index 5b453e7c..2e0b3c0a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -91,7 +91,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (IEnumerable)GetValue( ItemsSourceProperty );
+        return ( IEnumerable )GetValue( ItemsSourceProperty );
       }
       set
       {
@@ -103,7 +103,7 @@ namespace Xceed.Wpf.Toolkit
     {
       var CollectionControl = ( CollectionControl )d;
       if( CollectionControl != null )
-        CollectionControl.OnItemSourceChanged( (IEnumerable)e.OldValue, (IEnumerable)e.NewValue );
+        CollectionControl.OnItemSourceChanged( ( IEnumerable )e.OldValue, ( IEnumerable )e.NewValue );
     }
 
     public void OnItemSourceChanged( IEnumerable oldValue, IEnumerable newValue )
@@ -117,12 +117,12 @@ namespace Xceed.Wpf.Toolkit
           // We need to Add EditableKeyValuePairs from DictionaryEntries.
           foreach( DictionaryEntry item in dict )
           {
-            var keyType = (item.Key != null) 
+            var keyType = ( item.Key != null )
                           ? item.Key.GetType()
-                          : (dict.GetType().GetGenericArguments().Count() > 0) ? dict.GetType().GetGenericArguments()[0] : typeof( object );
-            var valueType = (item.Value != null)
+                          : ( dict.GetType().GetGenericArguments().Count() > 0 ) ? dict.GetType().GetGenericArguments()[ 0 ] : typeof( object );
+            var valueType = ( item.Value != null )
                           ? item.Value.GetType()
-                          : (dict.GetType().GetGenericArguments().Count() > 1) ? dict.GetType().GetGenericArguments()[ 1 ] : typeof( object );
+                          : ( dict.GetType().GetGenericArguments().Count() > 1 ) ? dict.GetType().GetGenericArguments()[ 1 ] : typeof( object );
             var editableKeyValuePair = ListUtilities.CreateEditableKeyValuePair( item.Key
                                                                                 , keyType
                                                                                 , item.Value
@@ -528,7 +528,7 @@ namespace Xceed.Wpf.Toolkit
 
     private void CanDuplicate( object sender, CanExecuteRoutedEventArgs e )
     {
-      var t = (e.Parameter != null) ? e.Parameter.GetType() : null;
+      var t = ( e.Parameter != null ) ? e.Parameter.GetType() : null;
       this.CanAddNewCore( t, e );
     }
 
@@ -617,7 +617,7 @@ namespace Xceed.Wpf.Toolkit
       if( collection is IDictionary )
       {
         //For a Dictionary, we need to parse the list of EditableKeyValuePair and add KeyValuePair to the Dictionary.
-        var dict = (IDictionary)collection;
+        var dict = ( IDictionary )collection;
         //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
         dict.Clear();
 
@@ -625,7 +625,7 @@ namespace Xceed.Wpf.Toolkit
         {
           var propInfoKey = item.GetType().GetProperty( "Key" );
           var propInfoValue = item.GetType().GetProperty( "Value" );
-          if( (propInfoKey != null) && (propInfoValue != null) )
+          if( ( propInfoKey != null ) && ( propInfoValue != null ) )
           {
             dict.Add( propInfoKey.GetValue( item, null ), propInfoValue.GetValue( item, null ) );
           }
@@ -634,7 +634,7 @@ namespace Xceed.Wpf.Toolkit
       //IList
       else if( collection is IList )
       {
-        var list = (IList)collection;
+        var list = ( IList )collection;
 
         //the easiest way to persist changes to the source is to just clear the source list and then add all items to it.
         list.Clear();
@@ -642,7 +642,7 @@ namespace Xceed.Wpf.Toolkit
         if( list.IsFixedSize )
         {
           if( sourceList.Count > list.Count )
-            throw new IndexOutOfRangeException("Exceeding array size.");
+            throw new IndexOutOfRangeException( "Exceeding array size." );
 
           for( int i = 0; i < sourceList.Count; ++i )
             list[ i ] = sourceList[ i ];
@@ -659,7 +659,7 @@ namespace Xceed.Wpf.Toolkit
       {
         //ICollection<T> (or IList<T>)
         var collectionType = collection.GetType();
-        var iCollectionOfTInterface = collectionType.GetInterfaces().FirstOrDefault( x => x.IsGenericType && (x.GetGenericTypeDefinition() == typeof( ICollection<> )) );
+        var iCollectionOfTInterface = collectionType.GetInterfaces().FirstOrDefault( x => x.IsGenericType && ( x.GetGenericTypeDefinition() == typeof( ICollection<> ) ) );
         if( iCollectionOfTInterface != null )
         {
           var argumentType = iCollectionOfTInterface.GetGenericArguments().FirstOrDefault();
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
index c2696db1..d674cdba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlButton.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
index b426ff29..0c4736cd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 e52920fb..b51c69f3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/CollectionControlDialog.xaml.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -19,17 +19,15 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Windows;
-using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Core.Utilities;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.Serialization;
 using System.Security;
-using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
-using Xceed.Wpf.Toolkit.PropertyGrid;
+using System.Windows;
 using System.Windows.Controls;
-using System.Reflection;
+using System.Windows.Media;
+using Xceed.Wpf.Toolkit.Core.Utilities;
+using Xceed.Wpf.Toolkit.PropertyGrid;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -204,7 +202,7 @@ namespace Xceed.Wpf.Toolkit
 
       if( source is Array )
       {
-        result = (source as Array).Clone();
+        result = ( source as Array ).Clone();
       }
       // For IDictionary, we need to create EditableKeyValuePair to edit the Key-Value.
       else if( ( this.ItemsSource is IDictionary )
@@ -252,13 +250,13 @@ namespace Xceed.Wpf.Toolkit
                 var propertyInfoValue = propertyInfo.GetValue( source, null );
                 this.GenerateValue( propertyInfo, propertyInfoValue, result );
               }
-              else 
+              else
               {
                 var countPropertyInfo = sourceType.GetProperty( "Count" );
                 if( countPropertyInfo != null )
                 {
                   var count = countPropertyInfo.GetValue( source, null ) as int?;
-                  if( ( count != null) && count.HasValue )
+                  if( ( count != null ) && count.HasValue )
                   {
                     for( int i = 0; i < count.Value; ++i )
                     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs
index 75b8ab49..f189737f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/Converters/NewItemTypesComboBoxConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,10 +17,9 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
-using System.Text;
 using System.Windows.Data;
-using System.Globalization;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit.Converters
@@ -40,11 +39,11 @@ namespace Xceed.Wpf.Toolkit.Converters
     {
 
       if( values.Length != 2 )
-        throw new ArgumentException("The 'values' argument should contain 2 objects.");
+        throw new ArgumentException( "The 'values' argument should contain 2 objects." );
 
       if( values[ 1 ] != null )
       {
-        if( !values[ 1 ].GetType().IsGenericType || !(values[ 1 ].GetType().GetGenericArguments().First().GetType() is Type) )
+        if( !values[ 1 ].GetType().IsGenericType || !( values[ 1 ].GetType().GetGenericArguments().First().GetType() is Type ) )
           throw new ArgumentException( "The 'value' argument is not of the correct type." );
 
         return values[ 1 ];
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs
index 82539654..68f76e29 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemAddingEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,12 +15,8 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Xceed.Wpf.Toolkit.Core;
 using System.Windows;
+using Xceed.Wpf.Toolkit.Core;
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs
index 71cbcc80..70fef8ca 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemDeletingEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,12 +15,8 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Xceed.Wpf.Toolkit.Core;
 using System.Windows;
+using Xceed.Wpf.Toolkit.Core;
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs
index 72f95b95..d8c109a9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/ItemEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 
 namespace Xceed.Wpf.Toolkit
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
index 5fcca5fd..a46072dc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Implementation/PrimitiveTypeCollectionControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -110,8 +110,14 @@ namespace Xceed.Wpf.Toolkit
 
     public bool IsReadOnly
     {
-      get { return ( bool )GetValue( IsReadOnlyProperty ); }
-      set { SetValue( IsReadOnlyProperty, value ); }
+      get
+      {
+        return ( bool )GetValue( IsReadOnlyProperty );
+      }
+      set
+      {
+        SetValue( IsReadOnlyProperty, value );
+      }
     }
 
     #endregion //IsReadOnly
@@ -198,7 +204,7 @@ namespace Xceed.Wpf.Toolkit
     #region Overrides
 
 
-#endregion
+    #endregion
 
     #region Methods
 
@@ -218,7 +224,7 @@ namespace Xceed.Wpf.Toolkit
       {
         if( list is Array )
         {
-           ( ( Array )list ).SetValue( item, counter++);
+          ( ( Array )list ).SetValue( item, counter++ );
         }
         else
         {
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 0c1f2372..5b1ec9b6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
index 44ba2032..3549c1f9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/CollectionControl/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
index bb594617..b0da3a8f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorCanvas.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -242,7 +242,7 @@ namespace Xceed.Wpf.Toolkit
         Color? col = null;
         if( !string.IsNullOrEmpty( newColorString ) )
         {
-          col = ( Color )ColorConverter.ConvertFromString( newColorString );      
+          col = ( Color )ColorConverter.ConvertFromString( newColorString );
         }
         UpdateSelectedColor( col );
       }
@@ -453,7 +453,7 @@ namespace Xceed.Wpf.Toolkit
 
     void SpectrumSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs<double> e )
     {
-      if( (_currentColorPosition != null) && (this.SelectedColor != null) )
+      if( ( _currentColorPosition != null ) && ( this.SelectedColor != null ) )
       {
         CalculateColor( ( Point )_currentColorPosition );
       }
@@ -493,8 +493,8 @@ namespace Xceed.Wpf.Toolkit
 
     private void UpdateSelectedColor( Color? color )
     {
-      SelectedColor = ( ( color != null ) && color.HasValue ) 
-                      ? (Color?)Color.FromArgb( color.Value.A, color.Value.R, color.Value.G, color.Value.B )
+      SelectedColor = ( ( color != null ) && color.HasValue )
+                      ? ( Color? )Color.FromArgb( color.Value.A, color.Value.R, color.Value.G, color.Value.B )
                       : null;
     }
 
@@ -515,10 +515,10 @@ namespace Xceed.Wpf.Toolkit
 
     private void UpdateColorShadeSelectorPositionAndCalculateColor( Point p, bool calculateColor )
     {
-      if( (_colorShadingCanvas == null) || ( _colorShadeSelector == null) )
+      if( ( _colorShadingCanvas == null ) || ( _colorShadeSelector == null ) )
         return;
 
-        if( p.Y < 0 )
+      if( p.Y < 0 )
         p.Y = 0;
 
       if( p.X < 0 )
@@ -544,7 +544,7 @@ namespace Xceed.Wpf.Toolkit
 
     private void UpdateColorShadeSelectorPosition( Color? color )
     {
-      if( (_spectrumSlider == null) || (_colorShadingCanvas == null) || (color == null) || !color.HasValue)
+      if( ( _spectrumSlider == null ) || ( _colorShadingCanvas == null ) || ( color == null ) || !color.HasValue )
         return;
 
       _currentColorPosition = null;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
index 95e0bdb5..2cf05b4e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Implementation/ColorSpectrumSlider.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,7 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -95,7 +94,7 @@ namespace Xceed.Wpf.Toolkit
 
       var colorsList = ColorUtilities.GenerateHsvSpectrum();
 
-      double stopIncrement = ( double )1 / (colorsList.Count - 1);
+      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 8dfb9d92..5094f6cf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
index 16c5caec..4d4db2eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorCanvas/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
index a8f03c69..ab26a37a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorItem.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -38,11 +38,11 @@ namespace Xceed.Wpf.Toolkit
       Name = name;
     }
 
-    public override bool Equals(object obj)
+    public override bool Equals( object obj )
     {
       var ci = obj as ColorItem;
-      if (ci == null)
-          return false;
+      if( ci == null )
+        return false;
       return ( ci.Color.Equals( Color ) && ci.Name.Equals( Name ) );
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
index b3f11102..e194222c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPicker.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -227,7 +227,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Brush)GetValue( DropDownBackgroundProperty );
+        return ( Brush )GetValue( DropDownBackgroundProperty );
       }
       set
       {
@@ -278,7 +278,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Brush)GetValue( HeaderBackgroundProperty );
+        return ( Brush )GetValue( HeaderBackgroundProperty );
       }
       set
       {
@@ -295,7 +295,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Brush)GetValue( HeaderForegroundProperty );
+        return ( Brush )GetValue( HeaderForegroundProperty );
       }
       set
       {
@@ -322,9 +322,9 @@ namespace Xceed.Wpf.Toolkit
 
     private static void OnIsOpenChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
     {
-      ColorPicker colorPicker = (ColorPicker)d;
+      ColorPicker colorPicker = ( ColorPicker )d;
       if( colorPicker != null )
-        colorPicker.OnIsOpenChanged( (bool)e.OldValue, (bool)e.NewValue );
+        colorPicker.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
     }
 
     private void OnIsOpenChanged( bool oldValue, bool newValue )
@@ -596,7 +596,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Brush)GetValue( TabBackgroundProperty );
+        return ( Brush )GetValue( TabBackgroundProperty );
       }
       set
       {
@@ -613,7 +613,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Brush)GetValue( TabForegroundProperty );
+        return ( Brush )GetValue( TabForegroundProperty );
       }
       set
       {
@@ -726,7 +726,7 @@ namespace Xceed.Wpf.Toolkit
     }
 
 
-#endregion //Base Class Overrides
+    #endregion //Base Class Overrides
 
     #region Event Handlers
 
@@ -866,7 +866,7 @@ namespace Xceed.Wpf.Toolkit
         IsOpen = false;
       ReleaseMouseCapture();
 
-      if( isFocusOnColorPicker && ( _toggleButton != null) )
+      if( isFocusOnColorPicker && ( _toggleButton != null ) )
         _toggleButton.Focus();
       this.UpdateRecentColors( new ColorItem( SelectedColor, SelectedColorText ) );
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs
index c26b4cbc..9003fc98 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorPickerTabItem.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs
index f1d9d4cb..74f85233 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Implementation/ColorSorter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,10 +17,6 @@
 
 using System;
 using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Media;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -34,8 +30,8 @@ namespace Xceed.Wpf.Toolkit
       ColorItem colorItem1 = ( ColorItem )firstItem;
       ColorItem colorItem2 = ( ColorItem )secondItem;
 
-      if( (colorItem1.Color == null) || !colorItem1.Color.HasValue || 
-          (colorItem2.Color == null) || !colorItem2.Color.HasValue )
+      if( ( colorItem1.Color == null ) || !colorItem1.Color.HasValue ||
+          ( colorItem2.Color == null ) || !colorItem2.Color.HasValue )
         return -1;
 
       System.Drawing.Color drawingColor1 = System.Drawing.Color.FromArgb( colorItem1.Color.Value.A, colorItem1.Color.Value.R, colorItem1.Color.Value.G, colorItem1.Color.Value.B );
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 0ec314ba..3ba6021e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
index 50557570..4c9a8e4e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/ColorPicker/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
index 81ffd877..246431dc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/CancelRoutedEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Windows;
 
 namespace Xceed.Wpf.Toolkit.Core
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs
index 054d26a2..89d1e9ce 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/AditionConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
index 05709be5..a6936fea 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/BorderThicknessToStrokeThicknessConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
index 25759991..9e7cc488 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs
index 6377cd98..76f28e08 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CenterTitleConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,45 +16,41 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Globalization;
 using System.Windows;
-using System.Windows.Media;
 using System.Windows.Controls;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.Core.Converters
 {
-    public class CenterTitleConverter : IMultiValueConverter
+  public class CenterTitleConverter : IMultiValueConverter
+  {
+    public object Convert( object[] values, Type targetType, object parameter, CultureInfo culture )
     {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            // Parameters: DesiredSize, WindowWidth, HeaderColumns
-            double titleTextWidth = ((Size)values[0]).Width;
-            double windowWidth = (double)values[1];
+      // Parameters: DesiredSize, WindowWidth, HeaderColumns
+      double titleTextWidth = ( ( Size )values[ 0 ] ).Width;
+      double windowWidth = ( double )values[ 1 ];
 
-            ColumnDefinitionCollection headerColumns = (ColumnDefinitionCollection)values[2];
-            double titleColWidth = headerColumns[2].ActualWidth;
-            double buttonsColWidth = headerColumns[3].ActualWidth;
+      ColumnDefinitionCollection headerColumns = ( ColumnDefinitionCollection )values[ 2 ];
+      double titleColWidth = headerColumns[ 2 ].ActualWidth;
+      double buttonsColWidth = headerColumns[ 3 ].ActualWidth;
 
 
-            // Result (1) Title is Centered across all HeaderColumns
-            if ((titleTextWidth + buttonsColWidth * 2) < windowWidth)
-                return 1;
+      // Result (1) Title is Centered across all HeaderColumns
+      if( ( titleTextWidth + buttonsColWidth * 2 ) < windowWidth )
+        return 1;
 
-            // Result (2) Title is Centered in HeaderColumns[2]
-            if (titleTextWidth < titleColWidth)
-                return 2;
+      // Result (2) Title is Centered in HeaderColumns[2]
+      if( titleTextWidth < titleColWidth )
+        return 2;
 
-            // Result (3) Title is Left-Aligned in HeaderColumns[2]
-            return 3;
-        }
+      // Result (3) Title is Left-Aligned in HeaderColumns[2]
+      return 3;
+    }
 
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
index 68da0c87..886131c2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorBlendConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -33,7 +33,10 @@ namespace Xceed.Wpf.Toolkit.Core.Converters
     /// </summary>
     public double BlendedColorRatio
     {
-      get { return _blendedColorRatio; }
+      get
+      {
+        return _blendedColorRatio;
+      }
 
       set
       {
@@ -47,7 +50,10 @@ namespace Xceed.Wpf.Toolkit.Core.Converters
     /// <summary>
     /// The color to blend with the source color
     /// </summary>
-    public Color BlendedColor { get; set; }
+    public Color BlendedColor
+    {
+      get; set;
+    }
 
     public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs
index feb15e2f..5b34537d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorModeToTabItemSelectedConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -26,7 +26,7 @@ namespace Xceed.Wpf.Toolkit.Core.Converters
     public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
     {
       var colorMode = ( ColorMode )value;
-      return (colorMode == ColorMode.ColorPalette) ? 0 : 1;
+      return ( colorMode == ColorMode.ColorPalette ) ? 0 : 1;
     }
 
     public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
index 3441a31b..4fae92aa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ColorToSolidColorBrushConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs
index 5438d2fb..9c8fc997 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/CornerRadiusToDoubleConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,34 +16,31 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Windows;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.Core.Converters
 {
-    public class CornerRadiusToDoubleConverter : IValueConverter
+  public class CornerRadiusToDoubleConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            double radius = 0.0;
+      double radius = 0.0;
 
-            if (value != null)
-                radius = ((CornerRadius)value).TopLeft;
+      if( value != null )
+        radius = ( ( CornerRadius )value ).TopLeft;
 
-            return radius;
-        }
+      return radius;
+    }
 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            double radius = 0.0;
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      double radius = 0.0;
 
-            if (value != null)
-                radius = (double)value;
+      if( value != null )
+        radius = ( double )value;
 
-            return new CornerRadius(radius);
-        }
+      return new CornerRadius( radius );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs
index 0eafbdca..53c557b6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/HalfConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,10 +16,7 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.Core.Converters
@@ -29,9 +26,9 @@ namespace Xceed.Wpf.Toolkit.Core.Converters
     public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
     {
       double size = ( double )value;
-      double modifier = (parameter != null) ? double.Parse( ( string )parameter ) : 0d;
+      double modifier = ( parameter != null ) ? double.Parse( ( string )parameter ) : 0d;
       if( modifier != 0 )
-        return Math.Max(0, size - modifier) / 2;
+        return Math.Max( 0, size - modifier ) / 2;
 
       return ( size / 2 );
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs
index 9ef126d2..bcf97aa8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/IntToThicknessConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,34 +16,31 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Windows;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.Core.Converters
 {
-    public class IntToThicknessConverter : IValueConverter
+  public class IntToThicknessConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      int thickValue = 0;
+      if( value != null )
+        thickValue = ( int )value;
+
+      if( parameter != null )
+      {
+        if( parameter.ToString().ToUpper() == "LEFT" )
+          return new Thickness( thickValue, 0, 0, 0 );
+      }
+
+      return new Thickness( thickValue );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            int thickValue = 0;
-            if (value != null)
-                thickValue = (int)value;
-
-            if (parameter != null)
-            {
-                if (parameter.ToString().ToUpper() == "LEFT")
-                    return new Thickness(thickValue, 0, 0, 0);
-            }
-
-            return new Thickness(thickValue);
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+      throw new NotImplementedException();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
index 2614d11f..3950d6b0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/InverseBoolConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs
index 07cdbeb0..8a6c44c4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/NullToBoolConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -25,7 +25,20 @@ namespace Xceed.Wpf.Toolkit.Core.Converters
   {
     public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
     {
-      return (value == null);
+      return ( value == null );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+  }
+
+  public class NotNullToBoolConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
+    {
+      return ( value != null );
     }
 
     public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
index cfaec0ce..c5dc06da 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ObjectTypeToNameConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -43,7 +43,7 @@ namespace Xceed.Wpf.Toolkit.Core.Converters
           return ( displayNameAttribute != null ) ? displayNameAttribute.DisplayName : type.Name;
         }
 
-        return value; 
+        return value;
       }
       return null;
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/PrintableFontFamilyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/PrintableFontFamilyConverter.cs
index 92c8cf15..dc3cb526 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/PrintableFontFamilyConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/PrintableFontFamilyConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
index 40ee04e6..501ec6a3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/RoundedValueConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
index 8eec75fb..7d4de77c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/SolidColorBrushToColorConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs
index 42bd41d1..006d8b1f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessSideRemovalConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -28,15 +28,24 @@ namespace Xceed.Wpf.Toolkit.Core.Converters
 
     public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
     {
-      var thickness = (Thickness)value;
-      var sideToRemove = int.Parse( (string)parameter );
+      var thickness = ( Thickness )value;
+      var sideToRemove = int.Parse( ( string )parameter );
       switch( sideToRemove )
       {
-        case 0: thickness.Left = 0d; break;
-        case 1: thickness.Top = 0d; break;
-        case 2: thickness.Right = 0d; break;
-        case 3: thickness.Bottom = 0d; break;
-        default: throw new InvalidContentException("parameter should be from 0 to 3 to specify the side to remove.");
+        case 0:
+          thickness.Left = 0d;
+          break;
+        case 1:
+          thickness.Top = 0d;
+          break;
+        case 2:
+          thickness.Right = 0d;
+          break;
+        case 3:
+          thickness.Bottom = 0d;
+          break;
+        default:
+          throw new InvalidContentException( "parameter should be from 0 to 3 to specify the side to remove." );
       }
       return thickness;
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs
index c77e0a70..96c99d27 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/ThicknessToDoubleConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,34 +16,31 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Windows;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.Core.Converters
 {
-    public class ThicknessToDoubleConverter : IValueConverter
+  public class ThicknessToDoubleConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            double thickness = 1.0;
+      double thickness = 1.0;
 
-            if (value != null)
-                thickness = ((Thickness)value).Top;
+      if( value != null )
+        thickness = ( ( Thickness )value ).Top;
 
-            return thickness;
-        }
+      return thickness;
+    }
 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            double thickness = 1.0;
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      double thickness = 1.0;
 
-            if (value != null)
-                thickness = (double)value;
+      if( value != null )
+        thickness = ( double )value;
 
-            return new Thickness(thickness);
-        }
+      return new Thickness( thickness );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
index f434aea7..f6d96314 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/VisibilityToBoolConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -19,7 +19,6 @@ using System;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
-using Xceed.Wpf.Toolkit.Core;
 
 namespace Xceed.Wpf.Toolkit.Core.Converters
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
index 01a01013..4f7eda31 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowContentBorderMarginConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,12 +16,9 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Globalization;
 using System.Windows;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.Core.Converters
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
index ff3dc883..eb9868ee 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WindowControlBackgroundConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,11 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Globalization;
+using System.Windows.Data;
 using System.Windows.Media;
 
 namespace Xceed.Wpf.Toolkit.Core.Converters
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
index 2fedb13a..2b12e40c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Converters/WizardPageButtonVisibilityConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -28,11 +28,11 @@ namespace Xceed.Wpf.Toolkit.Core.Converters
       if( values == null || values.Length != 2 )
         throw new ArgumentException( "Wrong number of arguments for WizardPageButtonVisibilityConverter." );
 
-      Visibility wizardVisibility = ( (values[ 0 ] == null) || (values[ 0 ] == DependencyProperty.UnsetValue) )
+      Visibility wizardVisibility = ( ( values[ 0 ] == null ) || ( values[ 0 ] == DependencyProperty.UnsetValue ) )
                                     ? Visibility.Hidden
                                     : ( Visibility )values[ 0 ];
 
-      WizardPageButtonVisibility wizardPageVisibility = ( (values[ 1 ] == null) || (values[ 1 ] == DependencyProperty.UnsetValue) )
+      WizardPageButtonVisibility wizardPageVisibility = ( ( values[ 1 ] == null ) || ( values[ 1 ] == DependencyProperty.UnsetValue ) )
                                                         ? WizardPageButtonVisibility.Hidden
                                                         : ( WizardPageButtonVisibility )values[ 1 ];
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs
index 34f34c0c..7ff4d49d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/EditableKeyValuePair.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
index 06c3ee4d..b4b42078 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ErrorMessages.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/GenericTextBlock.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/GenericTextBlock.cs
index 55fa3e9b..46409b21 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/GenericTextBlock.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/GenericTextBlock.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -20,7 +20,7 @@ using System.Windows.Controls;
 
 namespace Xceed.Wpf.Toolkit.Core
 {
-  public class GenericTextBlock: TextBlock
+  public class GenericTextBlock : TextBlock
   {
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ImageUriExtension.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ImageUriExtension.cs
index b5e275c4..01ba3b6c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ImageUriExtension.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ImageUriExtension.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -29,7 +29,7 @@ namespace Xceed.Wpf.Toolkit.Core
     /// </summary>
     /// <remarks>Generate an absolute uri by default</remarks>
     public ImageUriExtension()
-      :base( UriKind.Absolute )
+      : base( UriKind.Absolute )
     {
 
     }
@@ -37,7 +37,7 @@ namespace Xceed.Wpf.Toolkit.Core
     public override object ProvideValue( IServiceProvider serviceProvider )
     {
       // Call base class
-      Uri uri = ( Uri ) base.ProvideValue( serviceProvider );
+      Uri uri = ( Uri )base.ProvideValue( serviceProvider );
 
       // Create a bitmap image object using the generated uri as the source
       BitmapImage image = new BitmapImage( uri );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
index 208d59b9..cbdeb21d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
index 885be561..64a0d33d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/IndexChangedEventHandler.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
index 694f8ca2..e9911916 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/IValidateInput.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace Xceed.Wpf.Toolkit.Core.Input
 {
   public interface IValidateInput
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
index 731b1fbd..38fe4395 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/InputValidationErrorEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.Toolkit.Core.Input
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
index 866dca0d..f224ea8f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifier.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
index a7116603..f2f89dd4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollection.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
index daf05fbf..ec69c262 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Input/KeyModifierCollectionConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
index 532cc239..d374fb58 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidContentException.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
index 92c492da..f949c07c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/InvalidTemplateException.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs
index 9b5b7fbd..2fcee4fa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/LocationEnum.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
index 426ebe3d..6555773b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRate.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -18,8 +18,8 @@
 using System;
 using System.ComponentModel;
 using System.Runtime.InteropServices;
-using Xceed.Wpf.Toolkit.Core.Utilities;
 using Xceed.Wpf.Toolkit.Core;
+using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit.Media.Animation
 {
@@ -99,11 +99,11 @@ namespace Xceed.Wpf.Toolkit.Media.Animation
         if( this.HasDuration )
           return TimeSpan.FromTicks( _duration );
 
-        throw new InvalidOperationException( 
+        throw new InvalidOperationException(
           string.Format(
             ErrorMessages.GetMessage( ErrorMessages.InvalidRatePropertyAccessed ),
-            "Duration", 
-            this, 
+            "Duration",
+            this,
             "Speed" ) );
       }
     }
@@ -131,11 +131,11 @@ namespace Xceed.Wpf.Toolkit.Media.Animation
         if( this.HasSpeed )
           return _speed;
 
-        throw new InvalidOperationException( 
+        throw new InvalidOperationException(
           string.Format(
             ErrorMessages.GetMessage( ErrorMessages.InvalidRatePropertyAccessed ),
-            "Speed", 
-            this, 
+            "Speed",
+            this,
             "Duration" ) );
       }
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
index 1428e4bf..d3d598d1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/AnimationRateConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
index 8a6cbab0..ab824665 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquation.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
index 1fd9a29e..4d07b6a2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeAnimationEquationDelegate.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
index cb5a51bc..55b1ce91 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/IterativeEquationConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -33,9 +33,9 @@ namespace Xceed.Wpf.Toolkit.Media.Animation
       return type == typeof( IterativeEquation<double> );
     }
 
-    public override object ConvertFrom( 
+    public override object ConvertFrom(
       ITypeDescriptorContext typeDescriptorContext,
-      CultureInfo cultureInfo, 
+      CultureInfo cultureInfo,
       object value )
     {
       IterativeEquation<double> result = null;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
index 70157700..3011fa4e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquation.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
index 5550ea58..8c7b7c0d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/Animation/PennerEquations.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
index 7014808f..603bfb11 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Media/WindowColors.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Media;
 
 namespace Xceed.Wpf.Toolkit.Core.Media
@@ -53,7 +50,7 @@ namespace Xceed.Wpf.Toolkit.Core.Media
         {
           // If for any reason (for example, a SecurityException for XBAP apps)
           // we cannot read the value in the registry, fall back on some color.
-          _colorizationMode = Color.FromArgb(255, 175, 175, 175);
+          _colorizationMode = Color.FromArgb( 255, 175, 175, 175 );
         }
 
         return _colorizationMode.Value;
@@ -103,21 +100,21 @@ namespace Xceed.Wpf.Toolkit.Core.Media
 #else
         , Microsoft.Win32.RegistryOptions.None );
 #endif
-      return (int)subKey.GetValue( keyName );
+      return ( int )subKey.GetValue( keyName );
 #pragma warning restore CA1416
     }
 
     private static Color GetDWMColorValue( string keyName )
     {
       int value = WindowColors.GetDWMIntValue( keyName );
-        byte[] bytes = BitConverter.GetBytes( value );
-        return new Color()
-        {
-          B = bytes[ 0 ],
-          G = bytes[ 1 ],
-          R = bytes[ 2 ],
-          A = 255
-        };
+      byte[] bytes = BitConverter.GetBytes( value );
+      return new Color()
+      {
+        B = bytes[ 0 ],
+        G = bytes[ 1 ],
+        R = bytes[ 2 ],
+        A = 255
+      };
     }
 
     private static bool GetDWMBoolValue( string keyName )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PackUriExtension.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PackUriExtension.cs
index 09e0ed01..1de57afa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PackUriExtension.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PackUriExtension.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -25,7 +25,7 @@ namespace Xceed.Wpf.Toolkit.Core
   {
     #region Constructors
     public PackUriExtension()
-      :this( UriKind.Relative )
+      : this( UriKind.Relative )
     {
 
     }
@@ -41,8 +41,14 @@ namespace Xceed.Wpf.Toolkit.Core
 
     public string AssemblyName
     {
-      get { return this.m_assemblyName; }
-      set { this.m_assemblyName = value; }
+      get
+      {
+        return this.m_assemblyName;
+      }
+      set
+      {
+        this.m_assemblyName = value;
+      }
     }
 
     #endregion // AssemblyName Property
@@ -51,8 +57,14 @@ namespace Xceed.Wpf.Toolkit.Core
 
     public string Path
     {
-      get { return this.m_path; }
-      set { this.m_path = value; }
+      get
+      {
+        return this.m_path;
+      }
+      set
+      {
+        this.m_path = value;
+      }
     }
 
     #endregion // Path Property
@@ -61,8 +73,14 @@ namespace Xceed.Wpf.Toolkit.Core
 
     public UriKind Kind
     {
-      get { return this.m_uriKind; }
-      set { this.m_uriKind = value; }
+      get
+      {
+        return this.m_uriKind;
+      }
+      set
+      {
+        this.m_uriKind = value;
+      }
     }
 
     #endregion // Kind Property
@@ -110,8 +128,25 @@ namespace Xceed.Wpf.Toolkit.Core
 
       string platformSuffix = String.Empty;
 
-
-
+#if NETCORE
+          // If the assembly name doesn't already end with .NETCore
+          if( !assemblyName.EndsWith( ".NETCore", StringComparison.OrdinalIgnoreCase ) )
+          {
+            /* In the .NET core version, all assembly names end with .NETCore. */
+
+            // Setup a suffix
+            platformSuffix = ".NETCore";
+          }
+#elif NET5
+          // If the assembly name doesn't already end with .NET5
+          if( !assemblyName.EndsWith( ".NET5", StringComparison.OrdinalIgnoreCase ) )
+          {
+            /* In the .NET version, all assembly names end with .NET5. */
+
+            // Setup a suffix
+            platformSuffix = ".NET5";
+          }
+#endif // NETCORE
 
       // If we have version information
       if( !String.IsNullOrEmpty( version ) )
@@ -136,8 +171,25 @@ namespace Xceed.Wpf.Toolkit.Core
       string platformSuffix = String.Empty;
       bool hasAssemblyName = !String.IsNullOrEmpty( assemblyName );
 
-
-
+#if NETCORE
+          // If the assembly name doesn't already end with .NETCore
+          if( hasAssemblyName && !assemblyName.EndsWith( ".NETCore", StringComparison.OrdinalIgnoreCase ) )
+          {
+            /* In the .NET core version, all assembly names end with .NETCore. */
+
+            // Setup a suffix
+            platformSuffix = ".NETCore";
+          }
+#elif NET5
+          // If the assembly name doesn't already end with .NET5
+          if( hasAssemblyName && !assemblyName.EndsWith( ".NET5", StringComparison.OrdinalIgnoreCase ) )
+          {
+            /* In the .NET version, all assembly names end with .NET5. */
+
+            // Setup a suffix
+            platformSuffix = ".NET5";
+          }
+#endif // NETCORE
 
       // If we have an assembly name and version information
       if( hasAssemblyName && !String.IsNullOrEmpty( version ) )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
index 464351f1..3284735a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
index b700fec5..e833037c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/PropertyChangedEventHandler.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
index d5f1637c..01247e0b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryTextFromValueEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,8 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Xceed.Wpf.Toolkit.Core
 {
@@ -35,7 +33,10 @@ namespace Xceed.Wpf.Toolkit.Core
 
     public object Value
     {
-      get { return m_value; }
+      get
+      {
+        return m_value;
+      }
     }
 
     #endregion Value Property
@@ -46,8 +47,14 @@ namespace Xceed.Wpf.Toolkit.Core
 
     public string Text
     {
-      get { return m_text; }
-      set { m_text = value; }
+      get
+      {
+        return m_text;
+      }
+      set
+      {
+        m_text = value;
+      }
     }
 
     #endregion Text Property
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
index e11fbc5b..854e4d52 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/QueryValueFromTextEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,8 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace Xceed.Wpf.Toolkit.Core
 {
@@ -35,7 +33,10 @@ namespace Xceed.Wpf.Toolkit.Core
 
     public string Text
     {
-      get { return m_text; }
+      get
+      {
+        return m_text;
+      }
     }
 
     #endregion Text Property
@@ -46,8 +47,14 @@ namespace Xceed.Wpf.Toolkit.Core
 
     public object Value
     {
-      get { return m_value; }
-      set { m_value = value; }
+      get
+      {
+        return m_value;
+      }
+      set
+      {
+        m_value = value;
+      }
     }
 
     #endregion Value Property
@@ -58,8 +65,14 @@ namespace Xceed.Wpf.Toolkit.Core
 
     public bool HasParsingError
     {
-      get { return m_hasParsingError; }
-      set { m_hasParsingError = value; }
+      get
+      {
+        return m_hasParsingError;
+      }
+      set
+      {
+        m_hasParsingError = value;
+      }
     }
 
     #endregion HasParsingError Property
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ResourceDictionary.cs
index 5b781d56..4f3a116e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ResourceDictionary.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/ResourceDictionary.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -28,7 +28,9 @@ namespace Xceed.Wpf.Toolkit.Core
     private string _sourcePath;
 
 
-    public ResourceDictionary() { }
+    public ResourceDictionary()
+    {
+    }
 
     public ResourceDictionary( string assemblyName, string sourcePath )
     {
@@ -40,8 +42,11 @@ namespace Xceed.Wpf.Toolkit.Core
 
     public string AssemblyName
     {
-      get { return _assemblyName; }
-      set 
+      get
+      {
+        return _assemblyName;
+      }
+      set
       {
         this.EnsureInitialization();
         _assemblyName = value;
@@ -50,11 +55,14 @@ namespace Xceed.Wpf.Toolkit.Core
 
     public string SourcePath
     {
-      get { return _sourcePath; }
-      set 
+      get
+      {
+        return _sourcePath;
+      }
+      set
       {
         this.EnsureInitialization();
-        _sourcePath = value; 
+        _sourcePath = value;
       }
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
index af8ece1c..08f02575 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/UIElementAdorner.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
index d6d11323..e04e2cd6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/CalculatorUtilities.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -238,9 +238,9 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
 
     public static decimal ParseDecimal( string text )
     {
-      decimal result; 
+      decimal result;
       var success = Decimal.TryParse( text, NumberStyles.Any, CultureInfo.CurrentCulture, out result );
-      return success ? result : decimal.Zero;      
+      return success ? result : decimal.Zero;
     }
 
     public static decimal Add( decimal firstNumber, decimal secondNumber )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs
index ed9f8bbd..8dc62602 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ChangeTypeHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,10 +16,7 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.Toolkit.Core.Utilities
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
index 3a5274e9..f07dc387 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ColorUtilities.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -182,7 +182,7 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
 
       }
 
-      return Color.FromArgb( 255, ( byte )(  Math.Round(r * 255) ), ( byte )(  Math.Round(g * 255) ), ( byte )(  Math.Round(b * 255) ) );
+      return Color.FromArgb( 255, ( byte )( Math.Round( r * 255 ) ), ( byte )( Math.Round( g * 255 ) ), ( byte )( Math.Round( b * 255 ) ) );
     }
 
     /// <summary>
@@ -194,7 +194,7 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
       var colorsList = new List<Color>();
       int hStep = 60;
 
-      for( int h = 0; h < 360; h+= hStep )
+      for( int h = 0; h < 360; h += hStep )
       {
         colorsList.Add( ColorUtilities.ConvertHsvToRgb( h, 1, 1 ) );
       }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
index 60d1befb..4171a013 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ContextMenuUtilities.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -52,7 +52,7 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
     private static void Control_PreviewMouseLeftButtonDown( object sender, System.Windows.Input.MouseButtonEventArgs e )
     {
       var control = sender as FrameworkElement;
-      if( (control != null) && (control.ContextMenu != null) )
+      if( ( control != null ) && ( control.ContextMenu != null ) )
       {
         // Get PropertyItemBase parent
         var parent = VisualTreeHelper.GetParent( control );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs
index 5c25aeff..510eefad 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DateTimeUtilities.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.Toolkit.Core.Utilities
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
index 025bc9f2..ad305dd0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/DoubleHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
index 1794ad33..bc0878c6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/EllipseHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
index 88093d85..593346f5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/FontUtilities.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -18,9 +18,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Windows.Media;
 using System.Windows;
+using System.Windows.Media;
 
 namespace Xceed.Wpf.Toolkit.Core.Utilities
 {
@@ -40,8 +39,8 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
             // In WPF 4, this will throw an exception.
             var throwAcess = font.FamilyNames;
           }
-          catch 
-          { 
+          catch
+          {
             // It throws. Go to the next font family.
             continue;
           }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
index a43d2a3f..6ad6aab9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/GeneralUtilities.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,20 +15,16 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
-using System.Windows.Controls;
 using System.Windows.Data;
-using System.Windows.Media;
 
 namespace Xceed.Wpf.Toolkit.Core.Utilities
 {
   internal sealed class GeneralUtilities : DependencyObject
   {
-    private GeneralUtilities() { }
+    private GeneralUtilities()
+    {
+    }
 
     #region StubValue attached property
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
index b02e3a7a..fb2baa49 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/KeyboardUtilities.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Input;
 
 namespace Xceed.Wpf.Toolkit.Core.Utilities
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs
index 79ec23bd..1bf65031 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ListUtilities.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,11 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
 
 namespace Xceed.Wpf.Toolkit.Core.Utilities
 {
@@ -28,7 +25,7 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
   {
     internal static bool IsListOfItems( Type listType )
     {
-      return (ListUtilities.GetListItemType( listType ) != null);
+      return ( ListUtilities.GetListItemType( listType ) != null );
     }
 
     internal static Type GetListItemType( Type listType )
@@ -53,17 +50,17 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
     internal static Type GetCollectionItemType( Type colType )
     {
       Type iCollectionOfT = null;
-      var isCollectionOfT = colType.IsGenericType && (colType.GetGenericTypeDefinition() == typeof( ICollection<> ) );
+      var isCollectionOfT = colType.IsGenericType && ( colType.GetGenericTypeDefinition() == typeof( ICollection<> ) );
       if( isCollectionOfT )
       {
         iCollectionOfT = colType;
       }
       else
       {
-        iCollectionOfT = colType.GetInterfaces().FirstOrDefault(( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( ICollection<> ) );
+        iCollectionOfT = colType.GetInterfaces().FirstOrDefault( ( i ) => i.IsGenericType && i.GetGenericTypeDefinition() == typeof( ICollection<> ) );
       }
 
-      return (iCollectionOfT != null)
+      return ( iCollectionOfT != null )
         ? iCollectionOfT.GetGenericArguments()[ 0 ]
         : null;
     }
@@ -75,8 +72,8 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
 
     internal static Type[] GetDictionaryItemsType( Type dictType )
     {
-      var isDict = dictType.IsGenericType 
-        && ((dictType.GetGenericTypeDefinition() == typeof( Dictionary<,>) ) || (dictType.GetGenericTypeDefinition() == typeof( IDictionary<,>) ));
+      var isDict = dictType.IsGenericType
+        && ( ( dictType.GetGenericTypeDefinition() == typeof( Dictionary<,> ) ) || ( dictType.GetGenericTypeDefinition() == typeof( IDictionary<,> ) ) );
 
       return isDict
         ? new Type[] { dictType.GetGenericArguments()[ 0 ], dictType.GetGenericArguments()[ 1 ] }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
index e169d338..154ba3ff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PointHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
index 12c277c9..fa1be6dd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/PropertyChangedExt.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.ComponentModel;
 using System.Linq.Expressions;
 
@@ -28,9 +25,9 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
   {
     #region Notify Methods
 
-    public static void Notify<TMember>( 
+    public static void Notify<TMember>(
       this INotifyPropertyChanged sender,
-      PropertyChangedEventHandler handler, 
+      PropertyChangedEventHandler handler,
       Expression<Func<TMember>> expression )
     {
       if( sender == null )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
index 3018acfe..11e80b3c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RectHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
index faa6bd37..27de9d4b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ReflectionHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
index 9b860a78..9c54c7ae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ResourceHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
index d6045245..ad61bdea 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/RoutedEventHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
index fd6f6638..ca99d1a7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/Segment.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
index 8327d10e..03711d5f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/TreeHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,8 +17,8 @@
 
 using System;
 using System.Windows;
-using System.Windows.Media;
 using System.Windows.Controls.Primitives;
+using System.Windows.Media;
 
 namespace Xceed.Wpf.Toolkit.Core.Utilities
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
index 7cd38750..c4c6e386 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/ValueChangeHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,11 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
 using System.Collections;
+using System.Windows;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.Core.Utilities
@@ -60,7 +57,7 @@ namespace Xceed.Wpf.Toolkit.Core.Utilities
 
     #region Constructor
 
-    public ValueChangeHelper(Action changeCallback)
+    public ValueChangeHelper( Action changeCallback )
     {
       if( changeCallback == null )
         throw new ArgumentNullException( "changeCallback" );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
index 6d089dce..4f9bcdce 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/VisualTreeHelperEx.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
index 82f18a43..469b77dd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WeakEventListener.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,28 +16,25 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 
 namespace Xceed.Wpf.Toolkit.Core.Utilities
 {
   internal class WeakEventListener<TArgs> : IWeakEventListener where TArgs : EventArgs
   {
-    private Action<object,TArgs> _callback;
+    private Action<object, TArgs> _callback;
 
-    public WeakEventListener(Action<object,TArgs> callback)
+    public WeakEventListener( Action<object, TArgs> callback )
     {
       if( callback == null )
-         throw new ArgumentNullException( "callback" );
+        throw new ArgumentNullException( "callback" );
 
       _callback = callback;
     }
 
     public bool ReceiveWeakEvent( Type managerType, object sender, EventArgs e )
     {
-      _callback(sender, (TArgs)e);
+      _callback( sender, ( TArgs )e );
       return true;
     }
   }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
index 58fd54f5..aef6f5cd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/Utilities/WindowUtilities.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 
 namespace Xceed.Wpf.Toolkit.Core.Utilities
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs
index 12517efe..eed41160 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/VersionResourceDictionary.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -22,10 +22,12 @@ namespace Xceed.Wpf.Toolkit.Core
 {
   public class VersionResourceDictionary : ResourceDictionary
   {
-    public VersionResourceDictionary() { }
+    public VersionResourceDictionary()
+    {
+    }
 
     public VersionResourceDictionary( string assemblyName, string sourcePath )
-    :base( assemblyName, sourcePath )
+    : base( assemblyName, sourcePath )
     {
 
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
index 011a6d2b..780283b4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Core/WeakCollectionChangedWrapper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Collections;
 using System.Collections.Specialized;
 using Xceed.Wpf.Toolkit.Core.Utilities;
@@ -89,12 +86,18 @@ namespace Xceed.Wpf.Toolkit.Core
 
     bool IList.IsFixedSize
     {
-      get { return _innerList.IsFixedSize; }
+      get
+      {
+        return _innerList.IsFixedSize;
+      }
     }
 
     bool IList.IsReadOnly
     {
-      get { return _innerList.IsReadOnly; }
+      get
+      {
+        return _innerList.IsReadOnly;
+      }
     }
 
     void IList.Remove( object value )
@@ -109,8 +112,14 @@ namespace Xceed.Wpf.Toolkit.Core
 
     object IList.this[ int index ]
     {
-      get { return _innerList[ index ]; }
-      set { _innerList[ index ] = value; }
+      get
+      {
+        return _innerList[ index ];
+      }
+      set
+      {
+        _innerList[ index ] = value;
+      }
     }
     #endregion
 
@@ -123,17 +132,26 @@ namespace Xceed.Wpf.Toolkit.Core
 
     int ICollection.Count
     {
-      get { return _innerList.Count; }
+      get
+      {
+        return _innerList.Count;
+      }
     }
 
     bool ICollection.IsSynchronized
     {
-      get { return _innerList.IsSynchronized; }
+      get
+      {
+        return _innerList.IsSynchronized;
+      }
     }
 
     object ICollection.SyncRoot
     {
-      get { return _innerList.SyncRoot; }
+      get
+      {
+        return _innerList.SyncRoot;
+      }
     }
 
     #endregion
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs
index 8c95d95e..c090e878 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/Converters/BorderThicknessConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
index 1232b8b4..bab02c82 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Implementation/DateTimePicker.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -18,12 +18,13 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
 using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.Windows.Shapes;
+using System.Windows.Input;
 using System.Windows.Markup;
+using System.Windows.Shapes;
+using Xceed.Wpf.Toolkit.Primitives;
+using System.Diagnostics;
+using System.Windows.Media;
 #if VS2008
 using Microsoft.Windows.Controls;
 using Microsoft.Windows.Controls.Primitives;
@@ -67,6 +68,23 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //AutoCloseCalendar
 
+    #region AutoCloseCalendarOnTimeSelection 
+
+    public static readonly DependencyProperty AutoCloseCalendarOnTimeSelectionProperty = DependencyProperty.Register( "AutoCloseCalendarOnTimeSelection", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( false ) );
+    public bool AutoCloseCalendarOnTimeSelection
+    {
+      get
+      {
+        return ( bool )GetValue( AutoCloseCalendarOnTimeSelectionProperty );
+      }
+      set
+      {
+        SetValue( AutoCloseCalendarOnTimeSelectionProperty, value );
+      }
+    }
+
+    #endregion //AutoCloseCalendarOnTimeSelection
+
     #region CalendarDisplayMode
 
     public static readonly DependencyProperty CalendarDisplayModeProperty = DependencyProperty.Register( "CalendarDisplayMode", typeof( CalendarMode )
@@ -75,7 +93,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (CalendarMode)GetValue( CalendarDisplayModeProperty );
+        return ( CalendarMode )GetValue( CalendarDisplayModeProperty );
       }
       set
       {
@@ -135,7 +153,7 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-    private static bool IsTimeFormatStringValid(object value)
+    private static bool IsTimeFormatStringValid( object value )
     {
       return DateTimeUpDown.IsFormatStringValid( value );
     }
@@ -149,7 +167,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (bool)GetValue( TimePickerAllowSpinProperty );
+        return ( bool )GetValue( TimePickerAllowSpinProperty );
       }
       set
       {
@@ -159,6 +177,48 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //TimePickerAllowSpin
 
+    #region TimePickerTimeListItemsStyle
+
+    /// <summary>
+    /// TimePickerTimeListItemsStyle Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty TimePickerTimeListItemsStyleProperty = DependencyProperty.Register( "TimePickerTimeListItemsStyle", typeof( Style ), typeof( DateTimePicker ),
+            new FrameworkPropertyMetadata( ( Style )null, new PropertyChangedCallback( OnTimePickerTimeListItemsStyleChanged ) ) );
+
+    /// <summary>
+    /// Gets or sets the TimePickerTimeListItemsStyle property.  
+    /// This dependency property indicates the style to apply to TimeListItems objects.
+    /// </summary>
+    public Style TimePickerTimeListItemsStyle
+    {
+      get
+      {
+        return ( Style )GetValue( TimePickerTimeListItemsStyleProperty );
+      }
+      set
+      {
+        SetValue( TimePickerTimeListItemsStyleProperty, value );
+      }
+    }
+
+    /// <summary>
+    /// Handles changes to the TimePickerTimeListItemsStyle property.
+    /// </summary>
+    private static void OnTimePickerTimeListItemsStyleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( DateTimePicker )d ).OnTimePickerTimeListItemsStyleChanged( e );
+    }
+
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the TimePickerTimeListItemsStyle property.
+    /// </summary>
+    protected virtual void OnTimePickerTimeListItemsStyleChanged( DependencyPropertyChangedEventArgs e )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion
+
     #region TimePickerShowButtonSpinner
 
     public static readonly DependencyProperty TimePickerShowButtonSpinnerProperty = DependencyProperty.Register( "TimePickerShowButtonSpinner", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( true ) );
@@ -166,7 +226,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (bool)GetValue( TimePickerShowButtonSpinnerProperty );
+        return ( bool )GetValue( TimePickerShowButtonSpinnerProperty );
       }
       set
       {
@@ -227,6 +287,11 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //TimeWatermarkTemplate
 
+
+
+
+
+
     #endregion //Properties
 
     #region Constructors
@@ -239,6 +304,7 @@ namespace Xceed.Wpf.Toolkit
 
     public DateTimePicker()
     {
+      EventManager.RegisterClassHandler( typeof( ListBoxItem ), PreviewMouseUpEvent, new RoutedEventHandler( PreviewMouseUpEventHandler ) );
     }
 
     #endregion //Constructors
@@ -271,7 +337,9 @@ namespace Xceed.Wpf.Toolkit
       {
         _timePicker.ValueChanged -= this.TimePicker_ValueChanged;
       }
+
       _timePicker = GetTemplateChild( PART_TimeUpDown ) as TimePicker;
+
       if( _timePicker != null )
       {
         _timePicker.ValueChanged += this.TimePicker_ValueChanged;
@@ -280,27 +348,28 @@ namespace Xceed.Wpf.Toolkit
 
     protected override void OnPreviewMouseUp( MouseButtonEventArgs e )
     {
-      if( Mouse.Captured is CalendarItem)
+      if( Mouse.Captured is CalendarItem )
       {
         Mouse.Capture( null );
 
         // Do not close calendar on Year/Month Selection. Close only on Day selection.
-        if( AutoCloseCalendar && (_calendar != null) && ( _calendar.DisplayMode == CalendarMode.Month ) )
+        if( AutoCloseCalendar && ( _calendar != null ) && ( _calendar.DisplayMode == CalendarMode.Month ) )
         {
           ClosePopup( true );
         }
       }
+
       base.OnPreviewMouseUp( e );
     }
 
     protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
     {
       //The calendar only select the Date part, not the time part.
-      DateTime? newValueDate = (newValue != null) 
-        ? newValue.Value.Date 
-        : (DateTime?)null;
+      DateTime? newValueDate = ( newValue != null )
+        ? newValue.Value.Date
+        : ( DateTime? )null;
 
-      if( _calendar != null && _calendar.SelectedDate != newValueDate)
+      if( _calendar != null && _calendar.SelectedDate != newValueDate )
       {
         _isModifyingCalendarInternally = true;
         _calendar.SelectedDate = newValueDate;
@@ -311,7 +380,7 @@ namespace Xceed.Wpf.Toolkit
       //If we change any part of the datetime without
       //using the calendar when the actual date is temporary,
       //clear the temporary value. 
-      if( (_calendar != null) && (_calendarTemporaryDateTime != null) && (newValue != _calendarTemporaryDateTime ))
+      if( ( _calendar != null ) && ( _calendarTemporaryDateTime != null ) && ( newValue != _calendarTemporaryDateTime ) )
       {
         _calendarTemporaryDateTime = null;
         _calendarIntendedDateTime = null;
@@ -360,6 +429,33 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //Base Class Overrides
 
+    #region Command Hanlders
+
+
+
+    #endregion // Command Handlers
+
+    #region Events
+
+    #region Today Event
+
+    public static readonly RoutedEvent TodayEvent = EventManager.RegisterRoutedEvent( "Today", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( DateTimePicker ) );
+    public event RoutedEventHandler Today
+    {
+      add
+      {
+        AddHandler( TodayEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( TodayEvent, value );
+      }
+    }
+
+    #endregion //Cancel Event
+
+    #endregion // Events
+
     #region Event Handlers
 
     protected override void HandleKeyDown( object sender, KeyEventArgs e )
@@ -369,7 +465,7 @@ namespace Xceed.Wpf.Toolkit
       // Do not close the Calendar if the call is handled
       // by the TimePicker inside the DateTimePicker template.
       if( IsOpen
-        && ( _timePicker != null)
+        && ( _timePicker != null )
         && _timePicker.IsKeyboardFocusWithin
         && ( _timePicker.IsOpen || e.Handled ) )
         return;
@@ -455,10 +551,10 @@ namespace Xceed.Wpf.Toolkit
         //}
         //else
         //{
-          if( !_isModifyingCalendarInternally && !object.Equals( newDate, Value ) )
-          {
-            this.Value = newDate;
-          }
+        if( !_isModifyingCalendarInternally && !object.Equals( newDate, Value ) )
+        {
+          this.Value = newDate;
+        }
         //}
       }
     }
@@ -490,6 +586,22 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+    private void PreviewMouseUpEventHandler( object sender, RoutedEventArgs e )
+    {
+      var item = sender as ListBoxItem;
+
+      if( ( item != null ) && ( item.Content is TimeItem ) )
+      {
+        Mouse.Capture( null );
+
+        // Do not close calendar on Year/Month Selection. Close only on Day selection.
+        if( AutoCloseCalendarOnTimeSelection && ( _calendar != null ) && ( _calendar.DisplayMode == CalendarMode.Month ) )
+        {
+          ClosePopup( true );
+        }
+      }
+    }
+
     #endregion //Event Handlers
 
     #region Methods
@@ -500,12 +612,12 @@ namespace Xceed.Wpf.Toolkit
       {
         _calendar.BlackoutDates.Clear();
 
-        if( ( this.Minimum != null ) && this.Minimum.HasValue && ( this.Minimum.Value >= System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime.AddDays(1) ) )
+        if( ( this.Minimum != null ) && this.Minimum.HasValue && ( this.Minimum.Value >= System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime.AddDays( 1 ) ) )
         {
           DateTime minDate = this.Minimum.Value;
           _calendar.BlackoutDates.Add( new CalendarDateRange( System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime, minDate.AddDays( -1 ) ) );
         }
-        if( ( this.Maximum != null ) && this.Maximum.HasValue && ( this.Maximum.Value <= System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MaxSupportedDateTime.AddDays(-1)) )
+        if( ( this.Maximum != null ) && this.Maximum.HasValue && ( this.Maximum.Value <= System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MaxSupportedDateTime.AddDays( -1 ) ) )
         {
           DateTime maxDate = this.Maximum.Value;
           _calendar.BlackoutDates.Add( new CalendarDateRange( maxDate.AddDays( 1 ), System.Globalization.CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MaxSupportedDateTime ) );
@@ -513,6 +625,7 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
+
     #endregion //Methods
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
index 3bca7df2..99616013 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -33,7 +33,7 @@
   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
   <dateConv:BorderThicknessConverter x:Key="BorderThicknessConverter" />
 
-   <DataTemplate x:Key="DefaultWatermarkTemplate">
+  <DataTemplate x:Key="DefaultWatermarkTemplate">
     <ContentControl Content="{Binding}"
                     Foreground="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"
                     Focusable="False"
@@ -70,7 +70,6 @@
     </Setter>
   </Style>
 
-
   <!-- =============================================================================== -->
   <!-- DateTimePicker                                                                  -->
   <!-- =============================================================================== -->
@@ -227,6 +226,7 @@
                                       AllowSpin="{TemplateBinding TimePickerAllowSpin}"
                                       Step="{TemplateBinding Step}"
                                       ShowButtonSpinner="{TemplateBinding TimePickerShowButtonSpinner}"
+                                      TimeListItemsStyle="{TemplateBinding TimePickerTimeListItemsStyle}"
                                       Watermark="{TemplateBinding TimeWatermark}"
                                       WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"
                                       Visibility="{TemplateBinding TimePickerVisibility}" />
@@ -278,15 +278,15 @@
                       Value="{Binding ElementName=PART_TextBox}" />
             </Trigger>
             <MultiTrigger>
-               <MultiTrigger.Conditions>
-                  <Condition Property="ShowButtonSpinner"
-                              Value="False" />
-                  <Condition Property="ShowDropDownButton"
-                              Value="False" />
-               </MultiTrigger.Conditions>
-                  <Setter Property="BorderThickness"
-                           Value="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessConverter}}"
-                           TargetName="PART_Spinner"/>
+              <MultiTrigger.Conditions>
+                <Condition Property="ShowButtonSpinner"
+                           Value="False" />
+                <Condition Property="ShowDropDownButton"
+                           Value="False" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderThickness"
+                      Value="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessConverter}}"
+                      TargetName="PART_Spinner" />
             </MultiTrigger>
           </ControlTemplate.Triggers>
         </ControlTemplate>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
index a1584947..3834715e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimePicker/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -191,7 +191,7 @@
                               Height="{Binding DropDownButtonHeight, RelativeSource={RelativeSource TemplatedParent}}"
                               Background="White"
                               Focusable="False"
-                              Content="{Binding DropDownButtonContent, RelativeSource={RelativeSource TemplatedParent}}"                              
+                              Content="{Binding DropDownButtonContent, RelativeSource={RelativeSource TemplatedParent}}"
                               IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
                               Style="{StaticResource DateTimePickerToggleButtonStyle}"
                               IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
@@ -251,6 +251,7 @@
                                       AllowSpin="{TemplateBinding TimePickerAllowSpin}"
                                       Step="{TemplateBinding Step}"
                                       ShowButtonSpinner="{TemplateBinding TimePickerShowButtonSpinner}"
+                                      TimeListItemsStyle="{TemplateBinding TimePickerTimeListItemsStyle}"
                                       Watermark="{TemplateBinding TimeWatermark}"
                                       WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"
                                       Visibility="{TemplateBinding TimePickerVisibility}" />
@@ -285,18 +286,18 @@
                       Property="Content"
                       Value="{Binding DropDownButtonDisabledContent, RelativeSource={RelativeSource TemplatedParent}}" />
             </Trigger>
-               <MultiTrigger>
-                  <MultiTrigger.Conditions>
-                     <Condition Property="ShowButtonSpinner"
-                                 Value="False" />
-                     <Condition Property="ShowDropDownButton"
-                                 Value="False" />
-                  </MultiTrigger.Conditions>
-                  <Setter Property="BorderThickness"
-                           Value="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessConverter}}"
-                           TargetName="PART_Spinner" />
-               </MultiTrigger>
-            </ControlTemplate.Triggers>
+            <MultiTrigger>
+              <MultiTrigger.Conditions>
+                <Condition Property="ShowButtonSpinner"
+                           Value="False" />
+                <Condition Property="ShowDropDownButton"
+                           Value="False" />
+              </MultiTrigger.Conditions>
+              <Setter Property="BorderThickness"
+                      Value="{Binding BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessConverter}}"
+                      TargetName="PART_Spinner" />
+            </MultiTrigger>
+          </ControlTemplate.Triggers>
         </ControlTemplate>
       </Setter.Value>
     </Setter>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
index 563722b2..1fe3574f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeFormat.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
index 42a244ce..02abf467 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeInfo.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
index 069cc814..d68468f6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeParser.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -32,7 +32,7 @@ namespace Xceed.Wpf.Toolkit
       if( string.IsNullOrEmpty( value ) || string.IsNullOrEmpty( format ) )
         return false;
 
-      DateTimeParser.UpdateValueFormatForQuotes( ref value, ref format );      
+      DateTimeParser.UpdateValueFormatForQuotes( ref value, ref format );
 
       var dateTimeString = ComputeDateTimeString( value, format, currentDate, cultureInfo, autoClipTimeParts ).Trim();
 
@@ -98,12 +98,12 @@ namespace Xceed.Wpf.Toolkit
               dateTimeParts.Add( currentString );
             }
             currentformat = c.ToString();
-            currentString = (i < dateTime.Length) ? dateTime[ i ].ToString() : "";
+            currentString = ( i < dateTime.Length ) ? dateTime[ i ].ToString() : "";
           }
           else
           {
             currentformat = string.Concat( currentformat, c );
-            currentString = string.Concat( currentString, (i < dateTime.Length) ? dateTime[ i ] : '\0' );
+            currentString = string.Concat( currentString, ( i < dateTime.Length ) ? dateTime[ i ] : '\0' );
           }
         }
         if( !string.IsNullOrEmpty( currentformat ) )
@@ -116,7 +116,7 @@ namespace Xceed.Wpf.Toolkit
       //Auto-complete missing date parts
       if( dateTimeParts.Count < formats.Count )
       {
-        while( dateTimeParts.Count != formats.Count  )
+        while( dateTimeParts.Count != formats.Count )
         {
           dateTimeParts.Add( "0" );
         }
@@ -231,7 +231,7 @@ namespace Xceed.Wpf.Toolkit
         else if( item.Contains( "y" ) )
         {
           key = "Year";
-          value = currentDate.Year.ToString("D4");
+          value = currentDate.Year.ToString( "D4" );
         }
         if( !dateParts.ContainsKey( key ) )
         {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
index 0f305b15..14d17d24 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimePart.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
index 212214e6..8a6582f0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Implementation/DateTimeUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -43,7 +43,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (bool)GetValue( AutoClipTimePartsProperty );
+        return ( bool )GetValue( AutoClipTimePartsProperty );
       }
       set
       {
@@ -102,7 +102,7 @@ namespace Xceed.Wpf.Toolkit
       try
       {
         // Test the format string if it is used.
-        CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime.ToString( (string)value, CultureInfo.CurrentCulture );
+        CultureInfo.CurrentCulture.DateTimeFormat.Calendar.MinSupportedDateTime.ToString( ( string )value, CultureInfo.CurrentCulture );
       }
       catch
       {
@@ -121,14 +121,14 @@ namespace Xceed.Wpf.Toolkit
 
     protected virtual void OnFormatStringChanged( string oldValue, string newValue )
     {
-        FormatUpdated();
+      FormatUpdated();
     }
 
     #endregion //FormatString
 
     #region Kind
 
-    public static readonly DependencyProperty KindProperty = DependencyProperty.Register( "Kind", typeof( DateTimeKind ), typeof( DateTimeUpDown ), 
+    public static readonly DependencyProperty KindProperty = DependencyProperty.Register( "Kind", typeof( DateTimeKind ), typeof( DateTimeUpDown ),
       new FrameworkPropertyMetadata( DateTimeKind.Unspecified, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnKindChanged ) );
     public DateTimeKind Kind
     {
@@ -153,7 +153,7 @@ namespace Xceed.Wpf.Toolkit
     {
       //Upate the value based on kind. (Postpone to EndInit if not yet initialized)
       if( !_setKindInternal
-        && this.Value != null 
+        && this.Value != null
         && this.IsInitialized )
       {
         this.Value = this.ConvertToKind( this.Value.Value, newValue );
@@ -244,7 +244,7 @@ namespace Xceed.Wpf.Toolkit
       {
         this.Increment( this.Step );
       }
-    }    
+    }
 
     protected override void OnDecrement()
     {
@@ -329,7 +329,7 @@ namespace Xceed.Wpf.Toolkit
       DateTime? value = ( DateTime? )base.OnCoerceValue( newValue );
 
       //Let the initialized determine the final "kind" value.
-      if(value != null && this.IsInitialized)
+      if( value != null && this.IsInitialized )
       {
         //Update kind based on value kind
         this.SetKindInternal( value.Value.Kind );
@@ -344,7 +344,7 @@ namespace Xceed.Wpf.Toolkit
 
       //this only occurs when the user manually type in a value for the Value Property
       if( info == null )
-        info = (this.CurrentDateTimePart != DateTimePart.Other) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ];
+        info = ( this.CurrentDateTimePart != DateTimePart.Other ) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ];
       if( info == null )
         info = _dateTimeInfoList[ 0 ];
 
@@ -678,7 +678,7 @@ namespace Xceed.Wpf.Toolkit
       if( value1 == null || value2 == null )
         return false;
 
-      return (value1.Value < value2.Value);
+      return ( value1.Value < value2.Value );
     }
 
     protected override bool IsGreaterThan( DateTime? value1, DateTime? value2 )
@@ -686,7 +686,7 @@ namespace Xceed.Wpf.Toolkit
       if( value1 == null || value2 == null )
         return false;
 
-      return (value1.Value > value2.Value);
+      return ( value1.Value > value2.Value );
     }
 
     protected override void OnUpdateValueOnEnterKeyChanged( bool oldValue, bool newValue )
@@ -706,7 +706,7 @@ namespace Xceed.Wpf.Toolkit
     }
 
 
-#endregion //Base Class Overrides
+    #endregion //Base Class Overrides
 
     #region Methods
 
@@ -875,7 +875,7 @@ namespace Xceed.Wpf.Toolkit
 
       //this only occurs when the user manually type in a value for the Value Property
       if( info == null )
-        info = (this.CurrentDateTimePart != DateTimePart.Other) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ];
+        info = ( this.CurrentDateTimePart != DateTimePart.Other ) ? this.GetDateTimeInfo( this.CurrentDateTimePart ) : _dateTimeInfoList[ 0 ];
       if( info == null )
         info = _dateTimeInfoList[ 0 ];
 
@@ -887,45 +887,45 @@ namespace Xceed.Wpf.Toolkit
         {
           case DateTimePart.Year:
             {
-              result = ( ( DateTime )currentDateTime).AddYears( value );
+              result = ( ( DateTime )currentDateTime ).AddYears( value );
               break;
             }
           case DateTimePart.Month:
           case DateTimePart.MonthName:
             {
-              result = ( ( DateTime )currentDateTime).AddMonths( value );
+              result = ( ( DateTime )currentDateTime ).AddMonths( value );
               break;
             }
           case DateTimePart.Day:
           case DateTimePart.DayName:
             {
-              result = ( ( DateTime )currentDateTime).AddDays( value );
+              result = ( ( DateTime )currentDateTime ).AddDays( value );
               break;
             }
           case DateTimePart.Hour12:
           case DateTimePart.Hour24:
             {
-              result = ( ( DateTime )currentDateTime).AddHours( value );
+              result = ( ( DateTime )currentDateTime ).AddHours( value );
               break;
             }
           case DateTimePart.Minute:
             {
-              result = ( ( DateTime )currentDateTime).AddMinutes( value );
+              result = ( ( DateTime )currentDateTime ).AddMinutes( value );
               break;
             }
           case DateTimePart.Second:
             {
-              result = ( ( DateTime )currentDateTime).AddSeconds( value );
+              result = ( ( DateTime )currentDateTime ).AddSeconds( value );
               break;
             }
           case DateTimePart.Millisecond:
             {
-              result = ( ( DateTime )currentDateTime).AddMilliseconds( value );
+              result = ( ( DateTime )currentDateTime ).AddMilliseconds( value );
               break;
             }
           case DateTimePart.AmPmDesignator:
             {
-              result = ( ( DateTime )currentDateTime).AddHours( value * 12 );
+              result = ( ( DateTime )currentDateTime ).AddHours( value * 12 );
               break;
             }
           default:
@@ -986,7 +986,7 @@ namespace Xceed.Wpf.Toolkit
       //"ToLocalTime()" from an unspecified will assume
       // That the time was originaly Utc and affect the datetime value. 
       // Just "Force" the "Kind" instead.
-      if( dateTime.Kind == DateTimeKind.Unspecified 
+      if( dateTime.Kind == DateTimeKind.Unspecified
         || kind == DateTimeKind.Unspecified )
         return DateTime.SpecifyKind( dateTime, kind );
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
index 473c1412..b295b1a7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
index ccf7aae0..c86f94ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DateTimeUpDown/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
index f58a3de3..e2cda0ff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Implementation/DropDownButton.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -21,7 +21,6 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Primitives;
 using System.Windows.Media;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 
@@ -135,7 +134,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (PlacementMode)GetValue( DropDownPositionProperty );
+        return ( PlacementMode )GetValue( DropDownPositionProperty );
       }
       set
       {
@@ -221,7 +220,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (double)GetValue( MaxDropDownHeightProperty );
+        return ( double )GetValue( MaxDropDownHeightProperty );
       }
       set
       {
@@ -233,7 +232,7 @@ namespace Xceed.Wpf.Toolkit
     {
       var dropDownButton = o as DropDownButton;
       if( dropDownButton != null )
-        dropDownButton.OnMaxDropDownHeightChanged( (double)e.OldValue, (double)e.NewValue );
+        dropDownButton.OnMaxDropDownHeightChanged( ( double )e.OldValue, ( double )e.NewValue );
     }
 
     protected virtual void OnMaxDropDownHeightChanged( double oldValue, double newValue )
@@ -376,7 +375,7 @@ namespace Xceed.Wpf.Toolkit
 
     private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
     {
-      if( (_popup != null) && !_popup.IsMouseDirectlyOver )
+      if( ( _popup != null ) && !_popup.IsMouseDirectlyOver )
       {
         this.CloseDropDown( true );
       }
@@ -397,7 +396,7 @@ namespace Xceed.Wpf.Toolkit
       // Set the focus on the content of the ContentPresenter.
       if( _contentPresenter != null )
       {
-        _contentPresenter.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
+        _contentPresenter.MoveFocus( new TraversalRequest( FocusNavigationDirection.First ) );
       }
     }
 
@@ -431,7 +430,7 @@ namespace Xceed.Wpf.Toolkit
       }
       ReleaseMouseCapture();
 
-      if( isFocusOnButton && (this.Button != null) )
+      if( isFocusOnButton && ( this.Button != null ) )
       {
         Button.Focus();
       }
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 fdd9e4cd..26f8572a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
index 510f43c2..66bc5a53 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/DropDownButton/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs
index 3da94952..8293c04b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Implementation/IconButton.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml
index 380be473..b90da1b1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml
index 380be473..b90da1b1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/IconButton/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
index 5f14984d..0e6bca24 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Converters/RadiusConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
index 1d6f430b..167259cf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/FrameType.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
index df3ede90..dd3cfb9c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/Magnifier.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -72,7 +72,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (bool)GetValue( IsUsingZoomOnMouseWheelProperty );
+        return ( bool )GetValue( IsUsingZoomOnMouseWheelProperty );
       }
       set
       {
@@ -155,7 +155,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region ZoomFactor
 
-    public static readonly DependencyProperty ZoomFactorProperty = DependencyProperty.Register( "ZoomFactor", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( 0.5, OnZoomFactorPropertyChanged), OnValidationCallback );
+    public static readonly DependencyProperty ZoomFactorProperty = DependencyProperty.Register( "ZoomFactor", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( 0.5, OnZoomFactorPropertyChanged ), OnValidationCallback );
     public double ZoomFactor
     {
       get
@@ -195,7 +195,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (double)GetValue( ZoomFactorOnMouseWheelProperty );
+        return ( double )GetValue( ZoomFactorOnMouseWheelProperty );
       }
       set
       {
@@ -205,13 +205,13 @@ namespace Xceed.Wpf.Toolkit
 
     private static bool OnZoomFactorOnMouseWheelValidationCallback( object baseValue )
     {
-      double zoomFactorOnMouseWheel = (double)baseValue;
-      return (zoomFactorOnMouseWheel >= 0);
+      double zoomFactorOnMouseWheel = ( double )baseValue;
+      return ( zoomFactorOnMouseWheel >= 0 );
     }
 
     private static void OnZoomFactorOnMouseWheelPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
     {
-      Magnifier m = (Magnifier)d;
+      Magnifier m = ( Magnifier )d;
       m.OnZoomFactorOnMouseWheelChanged( e );
     }
 
@@ -250,12 +250,12 @@ namespace Xceed.Wpf.Toolkit
       if( this.FrameType == Toolkit.FrameType.Circle )
       {
         double newSize = Radius * 2;
-        if(!DoubleHelper.AreVirtuallyEqual( Width, newSize ))
+        if( !DoubleHelper.AreVirtuallyEqual( Width, newSize ) )
         {
           Width = newSize;
         }
 
-        if(!DoubleHelper.AreVirtuallyEqual( Height, newSize ))
+        if( !DoubleHelper.AreVirtuallyEqual( Height, newSize ) )
         {
           Height = newSize;
         }
@@ -302,9 +302,9 @@ namespace Xceed.Wpf.Toolkit
       if( !IsInitialized )
         return;
 
-      ViewBox = new Rect( 
-        ViewBox.Location, 
-        new Size( ActualWidth * ZoomFactor , ActualHeight * ZoomFactor ) );
+      ViewBox = new Rect(
+        ViewBox.Location,
+        new Size( ActualWidth * ZoomFactor, ActualHeight * ZoomFactor ) );
     }
 
     #endregion //Methods
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
index 7579deb1..4bb5b7a0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierAdorner.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -55,7 +55,7 @@ namespace Xceed.Wpf.Toolkit
     {
       Point pt = Mouse.GetPosition( this );
 
-      if( (_currentMousePosition == pt) && (_magnifier.ZoomFactor == _currentZoomFactor) )
+      if( ( _currentMousePosition == pt ) && ( _magnifier.ZoomFactor == _currentZoomFactor ) )
         return;
 
       if( _magnifier.IsFrozen )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
index b034f68a..8cd603b8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Implementation/MagnifierManager.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -75,7 +75,7 @@ namespace Xceed.Wpf.Toolkit
     private void Element_MouseWheel( object sender, MouseWheelEventArgs e )
     {
       var magnifier = MagnifierManager.GetMagnifier( _element ) as Magnifier;
-      if( (magnifier != null) && magnifier.IsUsingZoomOnMouseWheel )
+      if( ( magnifier != null ) && magnifier.IsUsingZoomOnMouseWheel )
       {
         if( e.Delta < 0 )
         {
@@ -86,9 +86,9 @@ namespace Xceed.Wpf.Toolkit
           magnifier.SetCurrentValue( Magnifier.ZoomFactorProperty, newValue );
 #endif
         }
-        else if ( e.Delta > 0 )
+        else if( e.Delta > 0 )
         {
-          var newValue = (magnifier.ZoomFactor >= magnifier.ZoomFactorOnMouseWheel) ? magnifier.ZoomFactor - magnifier.ZoomFactorOnMouseWheel : 0d;
+          var newValue = ( magnifier.ZoomFactor >= magnifier.ZoomFactorOnMouseWheel ) ? magnifier.ZoomFactor - magnifier.ZoomFactorOnMouseWheel : 0d;
 #if VS2008
           magnifier.ZoomFactor = newValue;
 #else
@@ -142,6 +142,6 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-#endregion //Methods
+    #endregion //Methods
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
index b827c1ab..4ade1294 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Magnifier/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
index 9a20d1c8..b561677e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/AutoCompletingMaskEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,9 +15,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Text;
 using System.ComponentModel;
 
 namespace Xceed.Wpf.Toolkit
@@ -36,11 +33,14 @@ namespace Xceed.Wpf.Toolkit
 
     #region MaskedTextProvider PROPERTY
 
-    private MaskedTextProvider m_maskedTextProvider;  
+    private MaskedTextProvider m_maskedTextProvider;
 
     public MaskedTextProvider MaskedTextProvider
     {
-      get { return m_maskedTextProvider; }
+      get
+      {
+        return m_maskedTextProvider;
+      }
     }
 
     #endregion MaskedTextProvider PROPERTY
@@ -51,7 +51,10 @@ namespace Xceed.Wpf.Toolkit
 
     public int StartPosition
     {
-      get { return m_startPosition; }
+      get
+      {
+        return m_startPosition;
+      }
     }
 
     #endregion StartPosition PROPERTY
@@ -62,7 +65,10 @@ namespace Xceed.Wpf.Toolkit
 
     public int SelectionLength
     {
-      get { return m_selectionLength; }
+      get
+      {
+        return m_selectionLength;
+      }
     }
 
     #endregion SelectionLength PROPERTY
@@ -73,7 +79,10 @@ namespace Xceed.Wpf.Toolkit
 
     public string Input
     {
-      get { return m_input; }
+      get
+      {
+        return m_input;
+      }
     }
 
     #endregion Input PROPERTY
@@ -85,8 +94,14 @@ namespace Xceed.Wpf.Toolkit
 
     public int AutoCompleteStartPosition
     {
-      get { return m_autoCompleteStartPosition; }
-      set { m_autoCompleteStartPosition = value; }
+      get
+      {
+        return m_autoCompleteStartPosition;
+      }
+      set
+      {
+        m_autoCompleteStartPosition = value;
+      }
     }
 
     #endregion AutoCompleteStartPosition PROPERTY
@@ -97,8 +112,14 @@ namespace Xceed.Wpf.Toolkit
 
     public string AutoCompleteText
     {
-      get { return m_autoCompleteText; }
-      set { m_autoCompleteText = value; }
+      get
+      {
+        return m_autoCompleteText;
+      }
+      set
+      {
+        m_autoCompleteText = value;
+      }
     }
 
     #endregion AutoCompleteText PROPERTY
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
index 74c92f7c..f24b3e5e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/InsertKeyModeEnum.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Xceed.Wpf.Toolkit
 {
   public enum InsertKeyMode
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
index 265cdac8..4ee3f15e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskFormatEnum.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Text;
-
 namespace Xceed.Wpf.Toolkit
 {
   public enum MaskFormat
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
index 82c7bba4..b1005893 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MaskedTextBox/Implementation/MaskedTextBox.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,23 +17,17 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
-using System.Windows.Controls;
-using System.Windows;
-using System.Windows.Data;
-using System.Collections.Specialized;
 using System.ComponentModel;
-using System.Windows.Input;
 using System.Diagnostics;
-using System.Windows.Documents;
 using System.Globalization;
-using System.Windows.Controls.Primitives;
 using System.Reflection;
-
-using System.Collections;
 using System.Security;
 using System.Security.Permissions;
-using System.Windows.Automation;
+using System.Text;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Documents;
+using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Xceed.Wpf.Toolkit
@@ -1223,9 +1217,9 @@ namespace Xceed.Wpf.Toolkit
       m_insertToggled = !m_insertToggled;
     }
 
-#endregion COMMANDS
+    #endregion COMMANDS
 
-#region DRAG DROP
+    #region DRAG DROP
 
     private void PreviewQueryContinueDragCallback( object sender, QueryContinueDragEventArgs e )
     {
@@ -1258,10 +1252,10 @@ namespace Xceed.Wpf.Toolkit
       base.OnDragOver( e );
     }
 
-#endregion DRAG DROP
+    #endregion DRAG DROP
 
 
-#region VALUE FROM TEXT
+    #region VALUE FROM TEXT
 
     protected override bool QueryValueFromTextCore( string text, out object value )
     {
@@ -1284,9 +1278,9 @@ namespace Xceed.Wpf.Toolkit
       return base.QueryValueFromTextCore( text, out value );
     }
 
-#endregion VALUE FROM TEXT
+    #endregion VALUE FROM TEXT
 
-#region TEXT FROM VALUE
+    #region TEXT FROM VALUE
 
     protected override string QueryTextFromValueCore( object value )
     {
@@ -1305,10 +1299,10 @@ namespace Xceed.Wpf.Toolkit
       return base.QueryTextFromValueCore( value );
     }
 
-#endregion TEXT FROM VALUE
+    #endregion TEXT FROM VALUE
 
 
-#region PROTECTED METHODS
+    #region PROTECTED METHODS
 
     protected virtual char[] GetMaskCharacters()
     {
@@ -1349,7 +1343,7 @@ namespace Xceed.Wpf.Toolkit
       provider.IncludeLiterals = true;
       provider.IncludePrompt = true;
 
-      provider.IsPassword = false;   
+      provider.IsPassword = false;
 
       return provider;
     }
@@ -1439,10 +1433,10 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-#endregion PROTECTED METHODS
+    #endregion PROTECTED METHODS
 
 
-#region INTERNAL PROPERTIES
+    #region INTERNAL PROPERTIES
 
     internal bool IsForcingMask
     {
@@ -1479,9 +1473,9 @@ namespace Xceed.Wpf.Toolkit
       return true;
     }
 
-#endregion INTERNAL PROPERTIES
+    #endregion INTERNAL PROPERTIES
 
-#region INTERNAL METHODS
+    #region INTERNAL METHODS
 
     internal override string GetCurrentText()
     {
@@ -1595,9 +1589,9 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-#endregion INTERNAL METHODS
+    #endregion INTERNAL METHODS
 
-#region PRIVATE PROPERTIES
+    #region PRIVATE PROPERTIES
 
     private bool IsOverwriteMode
     {
@@ -1939,7 +1933,7 @@ namespace Xceed.Wpf.Toolkit
     {
       //System.Diagnostics.Debug.Assert( provider.EditPositionCount > 0 );
 
-      bool includePrompt =  ( !this.HidePromptOnLeave || this.IsFocused );
+      bool includePrompt = ( !this.HidePromptOnLeave || this.IsFocused );
 
       string displayString = provider.ToString( false, includePrompt, true, 0, m_maskedTextProvider.Length );
 
@@ -1966,9 +1960,9 @@ namespace Xceed.Wpf.Toolkit
       return m_maskedTextProvider.ToString( true, includePrompt, includeLiterals, this.SelectionStart, selectionLength );
     }
 
-#endregion PRIVATE METHODS
+    #endregion PRIVATE METHODS
 
-#region PRIVATE FIELDS
+    #region PRIVATE FIELDS
 
     private MaskedTextProvider m_maskedTextProvider; // = null;
     private bool m_insertToggled; // = false;
@@ -1979,6 +1973,6 @@ namespace Xceed.Wpf.Toolkit
     private string m_formatSpecifier;
     private MethodInfo m_valueToStringMethodInfo; // = null;
 
-#endregion PRIVATE FIELDS
+    #endregion PRIVATE FIELDS
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
index feeab261..bd72ae28 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/MessageBox.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -99,7 +99,10 @@ namespace Xceed.Wpf.Toolkit
 
     protected Window Container
     {
-      get { return ( this.Parent as Window ); }
+      get
+      {
+        return ( this.Parent as Window );
+      }
     }
 
     #endregion //Protected Properties
@@ -215,7 +218,10 @@ namespace Xceed.Wpf.Toolkit
     /// </summary>
     public MessageBoxResult MessageBoxResult
     {
-      get { return _dialogResult; }
+      get
+      {
+        return _dialogResult;
+      }
     }
 
     #endregion //MessageBoxResult
@@ -313,7 +319,10 @@ namespace Xceed.Wpf.Toolkit
 
     internal override bool AllowPublicIsActiveChange
     {
-      get { return false; }
+      get
+      {
+        return false;
+      }
     }
 
     /// <summary>
@@ -404,7 +413,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 )
     {
-      return Show( messageText, string.Empty, MessageBoxButton.OK, (Style)null );
+      return Show( messageText, string.Empty, MessageBoxButton.OK, ( Style )null );
     }
 
     /// <summary>
@@ -416,7 +425,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( Window owner, string messageText )
     {
-      return Show( owner, messageText, string.Empty, MessageBoxButton.OK, (Style) null );
+      return Show( owner, messageText, string.Empty, MessageBoxButton.OK, ( Style )null );
     }
 
     /// <summary>
@@ -427,12 +436,12 @@ 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 )
     {
-        return Show(messageText, caption, MessageBoxButton.OK, (Style)null);
+      return Show( messageText, caption, MessageBoxButton.OK, ( Style )null );
     }
 
     public static MessageBoxResult Show( Window owner, string messageText, string caption )
     {
-        return Show(owner, messageText, caption, (Style)null);
+      return Show( owner, messageText, caption, ( Style )null );
     }
 
     public static MessageBoxResult Show( Window owner, string messageText, string caption, Style messageBoxStyle )
@@ -442,7 +451,7 @@ namespace Xceed.Wpf.Toolkit
 
     public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button )
     {
-        return Show(messageText, caption, button, (Style)null);
+      return Show( messageText, caption, button, ( Style )null );
     }
 
     /// <summary>
@@ -461,7 +470,7 @@ namespace Xceed.Wpf.Toolkit
 
     public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button )
     {
-        return Show(owner, messageText, caption, button, (Style)null);
+      return Show( owner, messageText, caption, button, ( Style )null );
     }
 
     public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, Style messageBoxStyle )
@@ -472,7 +481,7 @@ namespace Xceed.Wpf.Toolkit
 
     public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
     {
-        return Show(messageText, caption, button, icon, (Style)null);
+      return Show( messageText, caption, button, icon, ( Style )null );
     }
 
     /// <summary>
@@ -491,7 +500,7 @@ namespace Xceed.Wpf.Toolkit
 
     public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
     {
-        return Show(owner, messageText, caption, button, icon, (Style)null);
+      return Show( owner, messageText, caption, button, icon, ( Style )null );
     }
 
     public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, Style messageBoxStyle )
@@ -502,7 +511,7 @@ namespace Xceed.Wpf.Toolkit
 
     public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
     {
-        return Show(messageText, caption, button, icon, defaultResult, (Style)null);
+      return Show( messageText, caption, button, icon, defaultResult, ( Style )null );
     }
     /// <summary>
     /// Displays a message box that has a message and that returns a result.
@@ -521,7 +530,7 @@ namespace Xceed.Wpf.Toolkit
 
     public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
     {
-        return Show(owner, messageText, caption, button, icon, defaultResult, (Style) null);
+      return Show( owner, messageText, caption, button, icon, defaultResult, ( Style )null );
     }
 
 
@@ -829,7 +838,7 @@ namespace Xceed.Wpf.Toolkit
         throw new InvalidOperationException( "Static methods for MessageBoxes are not available in XBAP. Use the instance ShowMessageBox methods instead." );
       }
 
-      if( (owner != null) && (ownerHandle != IntPtr.Zero) )
+      if( ( owner != null ) && ( ownerHandle != IntPtr.Zero ) )
       {
         throw new NotSupportedException( "The owner of a MessageBox can't be both a Window and a WindowHandle." );
       }
@@ -871,7 +880,7 @@ namespace Xceed.Wpf.Toolkit
           }
           ) );
         }
-      }     
+      }
 
       return result;
     }
@@ -1122,7 +1131,7 @@ namespace Xceed.Wpf.Toolkit
 
     private void MessageBox_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
     {
-      if( (bool)e.NewValue )
+      if( ( bool )e.NewValue )
       {
         Action action = () =>
         {
@@ -1201,6 +1210,6 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-#endregion COMMANDS
+    #endregion COMMANDS
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
index c8ad5a19..179fdfba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Implementation/VisualStates.MessageBox.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 d62d936f..aa424421 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
index 03644080..9fd86051 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MessageBox/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
index 2da81257..0ffcaccd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 a57ba8c6..f3f8b876 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
index 169abf15..f894f913 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/MultiLineTextEditor/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
index a68bf856..e221737f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/AllowedSpecialValuesEnum.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
index 7ca7cfd0..1d724d4e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ByteUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -27,7 +27,7 @@ namespace Xceed.Wpf.Toolkit
     static ByteUpDown()
     {
       UpdateMetadata( typeof( ByteUpDown ), ( byte )1, byte.MinValue, byte.MaxValue );
-      MaxLengthProperty.OverrideMetadata( typeof(ByteUpDown), new FrameworkPropertyMetadata( 3 ) );
+      MaxLengthProperty.OverrideMetadata( typeof( ByteUpDown ), new FrameworkPropertyMetadata( 3 ) );
     }
 
     public ByteUpDown()
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
index bac6a64c..524626df 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/CommonNumericUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,10 +16,10 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Windows;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -63,8 +63,14 @@ namespace Xceed.Wpf.Toolkit
 
     public NumberStyles ParsingNumberStyle
     {
-      get { return ( NumberStyles )GetValue( ParsingNumberStyleProperty ); }
-      set { SetValue( ParsingNumberStyleProperty, value ); }
+      get
+      {
+        return ( NumberStyles )GetValue( ParsingNumberStyleProperty );
+      }
+      set
+      {
+        SetValue( ParsingNumberStyleProperty, value );
+      }
     }
 
     #endregion //ParsingNumberStyle
@@ -154,7 +160,7 @@ namespace Xceed.Wpf.Toolkit
     private bool HandleNullSpin()
     {
       var hasValue = this.UpdateValueOnEnterKey
-                     ? (this.ConvertTextToValue( this.TextBox.Text ) != null)
+                     ? ( this.ConvertTextToValue( this.TextBox.Text ) != null )
                      : this.Value.HasValue;
 
       if( !hasValue )
@@ -166,10 +172,10 @@ namespace Xceed.Wpf.Toolkit
         {
           this.TextBox.Text = newValue.Value.ToString( this.FormatString, this.CultureInfo );
         }
-        else 
+        else
         {
           this.Value = newValue;
-        }        
+        }
 
         return true;
       }
@@ -304,9 +310,9 @@ namespace Xceed.Wpf.Toolkit
       ValidSpinDirections validDirections = ValidSpinDirections.None;
 
       // Null increment always prevents spin.
-      if( (this.Increment != null) && !IsReadOnly )
+      if( ( this.Increment != null ) && !IsReadOnly )
       {
-        if( IsLowerThan( Value, Maximum ) || !Value.HasValue || !Maximum.HasValue)
+        if( IsLowerThan( Value, Maximum ) || !Value.HasValue || !Maximum.HasValue )
           validDirections = validDirections | ValidSpinDirections.Increase;
 
         if( IsGreaterThan( Value, Minimum ) || !Value.HasValue || !Minimum.HasValue )
@@ -323,14 +329,25 @@ namespace Xceed.Wpf.Toolkit
       if( PIndex >= 0 )
       {
         //stringToTest contains a "P" between 2 "'", it's considered as text, not percent
-        bool isText = (stringToTest.Substring( 0, PIndex ).Contains( "'" )
-                      && stringToTest.Substring( PIndex, FormatString.Length - PIndex ).Contains( "'" ));
+        bool isText = ( stringToTest.Substring( 0, PIndex ).Contains( "'" )
+                      && stringToTest.Substring( PIndex, FormatString.Length - PIndex ).Contains( "'" ) );
 
         return !isText;
       }
       return false;
     }
 
+    private bool CultureContainsCharacter( char c )
+    {
+      NumberFormatInfo info = NumberFormatInfo.GetInstance( this.CultureInfo );
+      var charString = c.ToString();
+
+      return info.GetType().GetProperties()
+                 .Where( p => p.PropertyType == typeof( string ) )
+                 .Select( p => ( string )p.GetValue( info, null ) )
+                 .Any( value => !string.IsNullOrEmpty( value ) && value == charString );
+    }
+
     private T? ConvertTextToValueCore( string currentValueText, string text )
     {
       T? result;
@@ -360,10 +377,26 @@ namespace Xceed.Wpf.Toolkit
               // same non-digit characters on currentValueText and new text => remove them on new Text to parse it again.
               if( currentValueTextSpecialCharacters.Except( textSpecialCharacters ).ToList().Count == 0 )
               {
-                foreach( var character in textSpecialCharacters )
+                var numericValue = new string( text.Where( c => char.IsDigit( c ) || this.CultureContainsCharacter( c ) ).ToArray() );
+                decimal number;
+                if( Decimal.TryParse( numericValue, this.ParsingNumberStyle, CultureInfo, out number ) )
+                {
+                  foreach( var character in textSpecialCharacters )
+                  {
+                    if( !this.CultureContainsCharacter( character ) )
+                    {
+                      text = text.Replace( character.ToString(), string.Empty );
+                    }
+                  }
+                }
+                else
                 {
-                  text = text.Replace( character.ToString(), string.Empty );
+                  foreach( var character in textSpecialCharacters )
+                  {
+                    text = text.Replace( character.ToString(), string.Empty );
+                  }
                 }
+
                 // if without the special characters, parsing is good, do not throw
                 if( _fromText( text, this.ParsingNumberStyle, CultureInfo, out outputValue ) )
                 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
index df09bb58..eacee157 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DecimalUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,7 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
index be2479dc..516daeba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/DoubleUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,8 +17,6 @@
 
 using System;
 using System.Windows;
-using System.Globalization;
-using System.IO;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -48,8 +46,14 @@ namespace Xceed.Wpf.Toolkit
 
     public AllowedSpecialValues AllowInputSpecialValues
     {
-      get { return ( AllowedSpecialValues )GetValue( AllowInputSpecialValuesProperty ); }
-      set { SetValue( AllowInputSpecialValuesProperty, value ); }
+      get
+      {
+        return ( AllowedSpecialValues )GetValue( AllowInputSpecialValuesProperty );
+      }
+      set
+      {
+        SetValue( AllowInputSpecialValuesProperty, value );
+      }
     }
 
     #endregion //AllowInputSpecialValues
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
index e24c9b76..c1e80963 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/IntegerUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,7 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
index df661686..c0009da2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/LongUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,7 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
index 3a5444bd..eedd139b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/NumericUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -87,7 +87,7 @@ namespace Xceed.Wpf.Toolkit
     {
       NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
       if( numericUpDown != null )
-        return numericUpDown.OnCoerceFormatString( (string)baseValue );
+        return numericUpDown.OnCoerceFormatString( ( string )baseValue );
 
       return baseValue;
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
index 31465386..15f8765d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SByteUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
index c4236e41..8658bfa9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ShortUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,7 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
index 08c2ccf2..c16711e8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/SingleUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,8 +17,6 @@
 
 using System;
 using System.Windows;
-using System.Globalization;
-using System.IO;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -47,8 +45,14 @@ namespace Xceed.Wpf.Toolkit
 
     public AllowedSpecialValues AllowInputSpecialValues
     {
-      get { return ( AllowedSpecialValues )GetValue( AllowInputSpecialValuesProperty ); }
-      set { SetValue( AllowInputSpecialValuesProperty, value ); }
+      get
+      {
+        return ( AllowedSpecialValues )GetValue( AllowInputSpecialValuesProperty );
+      }
+      set
+      {
+        SetValue( AllowInputSpecialValuesProperty, value );
+      }
     }
 
     #endregion //AllowInputSpecialValues
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
index 557baa2e..214fceb3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UIntegerUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,11 +16,10 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 
 namespace Xceed.Wpf.Toolkit
 {
-  [CLSCompliantAttribute(false)]
+  [CLSCompliantAttribute( false )]
   public class UIntegerUpDown : CommonNumericUpDown<uint>
   {
     #region Constructors
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
index 96565a1f..39e17b5d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/ULongUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
index ecbcc3d3..1684c5ca 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Implementation/UShortUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 0b75c031..2a8171d6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
index d117f2a0..5aa61f7f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/NumericUpDown/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
index d249b110..5a6d9cbf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Obselete/MaskedTextBox/Implementation/MaskedTextBox.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -23,7 +23,7 @@ using System.Windows.Input;
 
 namespace Xceed.Wpf.Toolkit.Obselete
 {
-  [Obsolete("Legacy implementation of MaskedTextBox. Use Xceed.Wpf.Toolkit.MaskedTextBox instead.", false)]
+  [Obsolete( "Legacy implementation of MaskedTextBox. Use Xceed.Wpf.Toolkit.MaskedTextBox instead.", false )]
   public class MaskedTextBox : TextBox
   {
     #region Members
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
index ac1603da..75183d98 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimationPanel.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
index fcf2798a..d7efc0d9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/AnimatorConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -18,7 +18,6 @@
 using System;
 using System.ComponentModel;
 using System.Globalization;
-using Xceed.Wpf.Toolkit.Panels;
 
 namespace Xceed.Wpf.Toolkit.Panels
 {
@@ -35,7 +34,7 @@ namespace Xceed.Wpf.Toolkit.Panels
           || ( type == typeof( DoubleAnimator ) );
     }
 
-    public override object ConvertFrom( 
+    public override object ConvertFrom(
       ITypeDescriptorContext typeDescriptorContext, CultureInfo cultureInfo, object value )
     {
       IterativeAnimator result = null;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
index 810ea3ef..f2ca6286 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/Animators.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
index 3a499488..fb5bf9ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
index 9adade6b..f8cc58fc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteredEventHandler.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
index 68ee8665..10d8b44d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
index e3586e20..7dc78cea 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildEnteringEventHandler.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
index 15aa6c88..9e5b102d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
index ebabe6b4..fbe88614 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitedEventHandler.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
index 2e69d20c..e68ab89a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
index de58791f..52a73d8e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ChildExitingEventHandler.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
index a8cf8649..4a1e7e6c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/DoubleAnimator.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
index c84bf9e9..a8c7c582 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/IterativeAnimator.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -18,8 +18,8 @@
 using System;
 using System.ComponentModel;
 using System.Windows;
-using Xceed.Wpf.Toolkit.Media.Animation;
 using Xceed.Wpf.Toolkit.Core;
+using Xceed.Wpf.Toolkit.Media.Animation;
 
 namespace Xceed.Wpf.Toolkit.Panels
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
index 496db17b..4c24492d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/PanelBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
index 6967aeb9..a0055f05 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/RandomPanel.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
index 836d2db9..9ed3a484 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/ScrollHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
index 55eb4309..d473a182 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPanel.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -23,12 +23,10 @@ using System.Threading;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
-using System.Windows.Documents;
 using System.Windows.Media;
 using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Primitives;
-using Xceed.Wpf.Toolkit.Media.Animation;
 using Xceed.Wpf.Toolkit.Core.Utilities;
+using Xceed.Wpf.Toolkit.Media.Animation;
 
 namespace Xceed.Wpf.Toolkit.Panels
 {
@@ -118,7 +116,7 @@ namespace Xceed.Wpf.Toolkit.Panels
       this.RaiseActiveLayoutChangedEvent();
       this.Dispatcher.BeginInvoke(
         DispatcherPriority.Normal,
-        ( ThreadStart )delegate()
+        ( ThreadStart )delegate ()
         {
           this.UpdateSwitchTemplate();
         } );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
index f898c181..fc244f28 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchPresenter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -45,7 +45,7 @@ namespace Xceed.Wpf.Toolkit.Panels
 
     // Using a DependencyProperty as the backing store for DelaySwitch.  This enables animation, styling, binding, etc...
     public static readonly DependencyProperty DelaySwitchProperty =
-      DependencyProperty.Register( "DelaySwitch", typeof( bool ), typeof( SwitchPresenter ), 
+      DependencyProperty.Register( "DelaySwitch", typeof( bool ), typeof( SwitchPresenter ),
         new UIPropertyMetadata( false ) );
 
     public bool DelaySwitch
@@ -87,7 +87,7 @@ namespace Xceed.Wpf.Toolkit.Panels
 
     internal static readonly DependencyProperty SwitchParentProperty =
       DependencyProperty.Register( "SwitchParent", typeof( SwitchPanel ), typeof( SwitchPresenter ),
-        new FrameworkPropertyMetadata( null, 
+        new FrameworkPropertyMetadata( null,
           new PropertyChangedCallback( SwitchPresenter.OnSwitchParentChanged ) ) );
 
     internal SwitchPanel SwitchParent
@@ -249,7 +249,7 @@ namespace Xceed.Wpf.Toolkit.Panels
       {
         Dictionary<string, Rect> newLocations = null;
         RoutedEventHandler onLoaded = null;
-        onLoaded = delegate( object sender, RoutedEventArgs e )
+        onLoaded = delegate ( object sender, RoutedEventArgs e )
         {
           FrameworkElement element = sender as FrameworkElement;
           element.Loaded -= onLoaded;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
index bccb1f70..e78782e1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/SwitchTemplate.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -28,7 +28,7 @@ namespace Xceed.Wpf.Toolkit.Panels
 
     public static readonly DependencyProperty IDProperty =
       DependencyProperty.RegisterAttached( "ID", typeof( string ), typeof( SwitchTemplate ),
-        new FrameworkPropertyMetadata( null, 
+        new FrameworkPropertyMetadata( null,
           new PropertyChangedCallback( SwitchTemplate.OnIDChanged ) ) );
 
     public static string GetID( DependencyObject d )
@@ -54,7 +54,7 @@ namespace Xceed.Wpf.Toolkit.Panels
       else
       {
         d.Dispatcher.BeginInvoke( DispatcherPriority.Loaded,
-            ( ThreadStart )delegate()
+            ( ThreadStart )delegate ()
         {
           parentPresenter = VisualTreeHelperEx.FindAncestorByType<SwitchPresenter>( d );
           if( parentPresenter != null )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
index 53729968..52ed1141 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Panels/WrapPanel.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -30,7 +30,7 @@ namespace Xceed.Wpf.Toolkit.Panels
 
     public static readonly DependencyProperty OrientationProperty =
       StackPanel.OrientationProperty.AddOwner( typeof( WrapPanel ),
-        new FrameworkPropertyMetadata( Orientation.Horizontal, 
+        new FrameworkPropertyMetadata( Orientation.Horizontal,
           new PropertyChangedCallback( WrapPanel.OnOrientationChanged ) ) );
 
     public Orientation Orientation
@@ -104,7 +104,7 @@ namespace Xceed.Wpf.Toolkit.Panels
 
     public static readonly DependencyProperty IsStackReversedProperty =
       DependencyProperty.Register( "IsChildOrderReversed", typeof( bool ), typeof( WrapPanel ),
-        new FrameworkPropertyMetadata( false, 
+        new FrameworkPropertyMetadata( false,
           new PropertyChangedCallback( WrapPanel.OnInvalidateMeasure ) ) );
 
     public bool IsChildOrderReversed
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
index eac124bd..d385d08c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/Pie.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -19,9 +19,9 @@ using System;
 using System.Collections.Specialized;
 using System.Windows;
 using System.Windows.Media;
-using Xceed.Wpf.Toolkit.Primitives;
 using Xceed.Wpf.Toolkit.Core;
 using Xceed.Wpf.Toolkit.Core.Utilities;
+using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Xceed.Wpf.Toolkit
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
index 44fd138d..0497bcec 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Implementation/PieModeEnum.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml
index 15497801..92b55ed7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml
index 4f92e434..4f11606a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Pie/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs
index 9d9ccf37..ce93af51 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/CachedTextInfo.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows.Controls;
 
 namespace Xceed.Wpf.Toolkit.Primitives
@@ -38,10 +35,22 @@ namespace Xceed.Wpf.Toolkit.Primitives
     {
     }
 
-    public string Text { get; private set; }
-    public int CaretIndex { get; private set; }
-    public int SelectionStart { get; private set; }
-    public int SelectionLength { get; private set; }
+    public string Text
+    {
+      get; private set;
+    }
+    public int CaretIndex
+    {
+      get; private set;
+    }
+    public int SelectionStart
+    {
+      get; private set;
+    }
+    public int SelectionLength
+    {
+      get; private set;
+    }
 
     #region ICloneable Members
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs
index b339eb87..8954e428 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimePickerBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -18,8 +18,8 @@
 using System;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
 using System.Windows.Controls.Primitives;
+using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 #if VS2008
 using Microsoft.Windows.Controls;
@@ -49,7 +49,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
     {
       get
       {
-        return (object)GetValue( DropDownButtonContentProperty );
+        return ( object )GetValue( DropDownButtonContentProperty );
       }
       set
       {
@@ -66,7 +66,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
     {
       get
       {
-        return (object)GetValue( DropDownButtonDisabledContentProperty );
+        return ( object )GetValue( DropDownButtonDisabledContentProperty );
       }
       set
       {
@@ -83,7 +83,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
     {
       get
       {
-        return (double)GetValue( DropDownButtonHeightProperty );
+        return ( double )GetValue( DropDownButtonHeightProperty );
       }
       set
       {
@@ -100,7 +100,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
     {
       get
       {
-        return (double)GetValue( DropDownButtonWidthProperty );
+        return ( double )GetValue( DropDownButtonWidthProperty );
       }
       set
       {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
index 9a26e7b7..0d5e1d0c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/DateTimeUpDownBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -18,12 +18,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Threading;
-using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Xceed.Wpf.Toolkit.Primitives
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs
index 3951f47b..dce88f93 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/HsvColor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs
index 8c56d84c..c9b3a62f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/InputBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs
index 1ba5aa4b..5c938366 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/MouseWheelActiveTriggerEnum.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace Xceed.Wpf.Toolkit.Primitives
 {
   /// <summary>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs
index e7eda06b..69c97a16 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelector.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,10 @@
 
   ***********************************************************************************/
 
+using System.Collections.Generic;
 using System.Collections.Specialized;
-using System.Windows;
 using System.Linq;
-using System.Collections.Generic;
+using System.Windows;
 
 namespace Xceed.Wpf.Toolkit.Primitives
 {
@@ -35,6 +35,35 @@ namespace Xceed.Wpf.Toolkit.Primitives
 
     #region Properties
 
+    #region AllItemsSelectedContent
+
+    public static readonly DependencyProperty AllItemsSelectedContentProperty = DependencyProperty.Register( "AllItemsSelectedContent", typeof( string ), typeof( SelectAllSelector )
+      , new UIPropertyMetadata( "All", OnAllItemsSelectedContentChanged ) );
+    public string AllItemsSelectedContent
+    {
+      get
+      {
+        return ( string )GetValue( AllItemsSelectedContentProperty );
+      }
+      set
+      {
+        SetValue( AllItemsSelectedContentProperty, value );
+      }
+    }
+
+    private static void OnAllItemsSelectedContentChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      var selectAllSelector = o as SelectAllSelector;
+      if( selectAllSelector != null )
+        selectAllSelector.OnAllItemsSelectedContentChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnAllItemsSelectedContentChanged( string oldValue, string newValue )
+    {
+    }
+
+    #endregion // SelectAllText
+
     #region IsSelectAllActive
 
     public static readonly DependencyProperty IsSelectAllActiveProperty = DependencyProperty.Register( "IsSelectAllActive", typeof( bool ), typeof( SelectAllSelector ), new UIPropertyMetadata( false, OnIsSelectAllActiveChanged ) );
@@ -115,7 +144,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
 
     public void SelectAll()
     {
-      var currentSelectedItems = new List<object>(this.SelectedItems as IEnumerable<object>);
+      var currentSelectedItems = new List<object>( this.SelectedItems as IEnumerable<object> );
       var items = this.ItemsCollection.Cast<object>();
 
       // Have a faster selection when there are more than 200 items.
@@ -123,7 +152,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
 
       // Raise SelectionChanged for new selected items.
       var newSelectedItems = items.Except( currentSelectedItems );
-      foreach ( var item in newSelectedItems)
+      foreach( var item in newSelectedItems )
       {
         this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, true ) );
       }
@@ -136,7 +165,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
       this.SelectedItems.Clear();
 
       // Raise SelectionChanged for selected items.
-      foreach (var item in currentSelectedItems)
+      foreach( var item in currentSelectedItems )
       {
         this.OnItemSelectionChanged( new ItemSelectionChangedEventArgs( Selector.ItemSelectionChangedEvent, this, item, false ) );
       }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs
index 4e1e5b5f..d060d8eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectAllSelectorItem.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs
index b8f0c533..34024676 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Selector.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,18 +17,15 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Collections.Specialized;
 using System.ComponentModel;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
 using System.Windows.Input;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Reflection;
 using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Threading;
 
 namespace Xceed.Wpf.Toolkit.Primitives
 {
@@ -511,7 +508,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
         return ( prop != null )
           ? prop.GetValue( item, null )
           : null;
-      }      
+      }
     }
 
     protected object GetItemValue( object item )
@@ -817,8 +814,8 @@ namespace Xceed.Wpf.Toolkit.Primitives
     protected virtual void OnItemSelectionChanging( ItemSelectionChangingEventArgs args )
     {
       if( ItemSelectionChanging != null )
-      { 
-         ItemSelectionChanging( this, args );
+      {
+        ItemSelectionChanging( this, args );
       }
     }
 
@@ -1072,7 +1069,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
     }
   }
 
-  public delegate void ItemSelectionChangingEventHandler( object sender, ItemSelectionChangingEventArgs e ); 
+  public delegate void ItemSelectionChangingEventHandler( object sender, ItemSelectionChangingEventArgs e );
   public class ItemSelectionChangingEventArgs : CancelEventArgs
   {
     public bool NewIsSelected
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs
index 4bd0042f..dddbf271 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/SelectorItem.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs
index 5826fae4..99cea642 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ShapeBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml
index b652a2dd..af27d45b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/SelectorItem.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 6957981f..b1a21880 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Aero2/WindowControl.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -314,7 +314,9 @@
                 TargetName="TitleText" />
       </Trigger>
 
-      <!-- Center the Window Title on the entire window -->
+
+
+
       <DataTrigger Value="1">
         <DataTrigger.Binding>
           <MultiBinding Converter="{StaticResource CenterTitleConverter}">
@@ -337,7 +339,6 @@
                 Value="Center" />
       </DataTrigger>
 
-      <!-- Center the Window Title in it's own column -->
       <DataTrigger Value="2">
         <DataTrigger.Binding>
           <MultiBinding Converter="{StaticResource CenterTitleConverter}">
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml
index 7c821c54..62152a21 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/SelectorItem.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 14292df8..af4d4b7b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/Generic/WindowControl.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -307,7 +307,9 @@
                 TargetName="TitleText" />
       </Trigger>
 
-      <!-- Center the Window Title on the entire window -->
+
+
+
       <DataTrigger Value="1">
         <DataTrigger.Binding>
           <MultiBinding Converter="{StaticResource CenterTitleConverter}">
@@ -330,7 +332,6 @@
                 Value="Center" />
       </DataTrigger>
 
-      <!-- Center the Window Title in it's own column -->
       <DataTrigger Value="2">
         <DataTrigger.Binding>
           <MultiBinding Converter="{StaticResource CenterTitleConverter}">
@@ -346,7 +347,6 @@
                 Property="HorizontalAlignment"
                 Value="Center" />
       </DataTrigger>
-
     </ControlTemplate.Triggers>
   </ControlTemplate>
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs
index e2a75cf7..f274647b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/Themes/ResourceKeys.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -27,7 +27,7 @@ namespace Xceed.Wpf.Toolkit.Themes
     public static readonly ComponentResourceKey ControlDisabledBackgroundKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlDisabledBackgroundKey" );
     public static readonly ComponentResourceKey ControlNormalBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlNormalBorderKey" );
     public static readonly ComponentResourceKey ControlMouseOverBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlMouseOverBorderKey" );
-    public static readonly ComponentResourceKey ControlSelectedBorderKey = new ComponentResourceKey(typeof(ResourceKeys), "ControlSelectedBorderKey");
+    public static readonly ComponentResourceKey ControlSelectedBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlSelectedBorderKey" );
     public static readonly ComponentResourceKey ControlFocusedBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ControlFocusedBorderKey" );
 
     public static readonly ComponentResourceKey ButtonNormalOuterBorderKey = new ComponentResourceKey( typeof( ResourceKeys ), "ButtonNormalOuterBorderKey" );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs
index 8eaa804f..4ff4b43a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/UpDownBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,14 +16,13 @@
   ***********************************************************************************/
 
 using System;
+using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;
-using Xceed.Wpf.Toolkit.Core;
-using Xceed.Wpf.Toolkit.Core.Input;
-using System.Globalization;
 using System.Windows.Threading;
+using Xceed.Wpf.Toolkit.Core.Input;
 
 namespace Xceed.Wpf.Toolkit.Primitives
 {
@@ -75,7 +74,7 @@ new UIPropertyMetadata( true ) );
     {
       get
       {
-        return (bool)GetValue( AllowSpinProperty );
+        return ( bool )GetValue( AllowSpinProperty );
       }
       set
       {
@@ -92,7 +91,7 @@ new UIPropertyMetadata( true ) );
     {
       get
       {
-        return (double)GetValue( ButtonSpinnerHeightProperty );
+        return ( double )GetValue( ButtonSpinnerHeightProperty );
       }
       set
       {
@@ -111,7 +110,7 @@ new UIPropertyMetadata( true ) );
     {
       get
       {
-        return (Location)GetValue( ButtonSpinnerLocationProperty );
+        return ( Location )GetValue( ButtonSpinnerLocationProperty );
       }
       set
       {
@@ -128,7 +127,7 @@ new UIPropertyMetadata( true ) );
     {
       get
       {
-        return (DataTemplate)GetValue( ButtonSpinnerDownContentTemplateProperty );
+        return ( DataTemplate )GetValue( ButtonSpinnerDownContentTemplateProperty );
       }
       set
       {
@@ -145,7 +144,7 @@ new UIPropertyMetadata( true ) );
     {
       get
       {
-        return (DataTemplate)GetValue( ButtonSpinnerDownDisabledContentTemplateProperty );
+        return ( DataTemplate )GetValue( ButtonSpinnerDownDisabledContentTemplateProperty );
       }
       set
       {
@@ -157,12 +156,12 @@ new UIPropertyMetadata( true ) );
 
     #region ButtonSpinnerUpContentTemplate
 
-    public static readonly DependencyProperty ButtonSpinnerUpContentTemplateProperty = DependencyProperty.Register( "ButtonSpinnerUpContentTemplate", typeof( DataTemplate), typeof( UpDownBase<T> ), new UIPropertyMetadata( null ) );
+    public static readonly DependencyProperty ButtonSpinnerUpContentTemplateProperty = DependencyProperty.Register( "ButtonSpinnerUpContentTemplate", typeof( DataTemplate ), typeof( UpDownBase<T> ), new UIPropertyMetadata( null ) );
     public DataTemplate ButtonSpinnerUpContentTemplate
     {
       get
       {
-        return (DataTemplate)GetValue( ButtonSpinnerUpContentTemplateProperty );
+        return ( DataTemplate )GetValue( ButtonSpinnerUpContentTemplateProperty );
       }
       set
       {
@@ -179,7 +178,7 @@ new UIPropertyMetadata( true ) );
     {
       get
       {
-        return (DataTemplate)GetValue( ButtonSpinnerUpDisabledContentTemplateProperty );
+        return ( DataTemplate )GetValue( ButtonSpinnerUpDisabledContentTemplateProperty );
       }
       set
       {
@@ -196,7 +195,7 @@ new UIPropertyMetadata( true ) );
     {
       get
       {
-        return (double)GetValue( ButtonSpinnerWidthProperty );
+        return ( double )GetValue( ButtonSpinnerWidthProperty );
       }
       set
       {
@@ -215,7 +214,7 @@ UpDownBase<T> ), new UIPropertyMetadata( false ) );
     {
       get
       {
-        return (bool)GetValue( ClipValueToMinMaxProperty );
+        return ( bool )GetValue( ClipValueToMinMaxProperty );
       }
       set
       {
@@ -234,7 +233,7 @@ typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( false, OnDispla
     {
       get
       {
-        return (bool)GetValue( DisplayDefaultValueOnEmptyTextProperty );
+        return ( bool )GetValue( DisplayDefaultValueOnEmptyTextProperty );
       }
       set
       {
@@ -244,7 +243,7 @@ typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( false, OnDispla
 
     private static void OnDisplayDefaultValueOnEmptyTextChanged( DependencyObject source, DependencyPropertyChangedEventArgs args )
     {
-      ((UpDownBase<T>)source).OnDisplayDefaultValueOnEmptyTextChanged( (bool)args.OldValue, (bool)args.NewValue );
+      ( ( UpDownBase<T> )source ).OnDisplayDefaultValueOnEmptyTextChanged( ( bool )args.OldValue, ( bool )args.NewValue );
     }
 
     private void OnDisplayDefaultValueOnEmptyTextChanged( bool oldValue, bool newValue )
@@ -266,7 +265,7 @@ typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( false, OnDispla
     {
       get
       {
-        return (T)GetValue( DefaultValueProperty );
+        return ( T )GetValue( DefaultValueProperty );
       }
       set
       {
@@ -276,7 +275,7 @@ typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( false, OnDispla
 
     private static void OnDefaultValueChanged( DependencyObject source, DependencyPropertyChangedEventArgs args )
     {
-      ((UpDownBase<T>)source).OnDefaultValueChanged( (T)args.OldValue, (T)args.NewValue );
+      ( ( UpDownBase<T> )source ).OnDefaultValueChanged( ( T )args.OldValue, ( T )args.NewValue );
     }
 
     private void OnDefaultValueChanged( T oldValue, T newValue )
@@ -298,7 +297,7 @@ UIPropertyMetadata( default( T ), OnMaximumChanged, OnCoerceMaximum ) );
     {
       get
       {
-        return (T)GetValue( MaximumProperty );
+        return ( T )GetValue( MaximumProperty );
       }
       set
       {
@@ -310,7 +309,7 @@ UIPropertyMetadata( default( T ), OnMaximumChanged, OnCoerceMaximum ) );
     {
       UpDownBase<T> upDown = o as UpDownBase<T>;
       if( upDown != null )
-        upDown.OnMaximumChanged( (T)e.OldValue, (T)e.NewValue );
+        upDown.OnMaximumChanged( ( T )e.OldValue, ( T )e.NewValue );
     }
 
     protected virtual void OnMaximumChanged( T oldValue, T newValue )
@@ -325,7 +324,7 @@ UIPropertyMetadata( default( T ), OnMaximumChanged, OnCoerceMaximum ) );
     {
       UpDownBase<T> upDown = d as UpDownBase<T>;
       if( upDown != null )
-        return upDown.OnCoerceMaximum( (T)baseValue );
+        return upDown.OnCoerceMaximum( ( T )baseValue );
 
       return baseValue;
     }
@@ -346,7 +345,7 @@ UIPropertyMetadata( default( T ), OnMinimumChanged, OnCoerceMinimum ) );
     {
       get
       {
-        return (T)GetValue( MinimumProperty );
+        return ( T )GetValue( MinimumProperty );
       }
       set
       {
@@ -358,7 +357,7 @@ UIPropertyMetadata( default( T ), OnMinimumChanged, OnCoerceMinimum ) );
     {
       UpDownBase<T> upDown = o as UpDownBase<T>;
       if( upDown != null )
-        upDown.OnMinimumChanged( (T)e.OldValue, (T)e.NewValue );
+        upDown.OnMinimumChanged( ( T )e.OldValue, ( T )e.NewValue );
     }
 
     protected virtual void OnMinimumChanged( T oldValue, T newValue )
@@ -373,7 +372,7 @@ UIPropertyMetadata( default( T ), OnMinimumChanged, OnCoerceMinimum ) );
     {
       UpDownBase<T> upDown = d as UpDownBase<T>;
       if( upDown != null )
-        return upDown.OnCoerceMinimum( (T)baseValue );
+        return upDown.OnCoerceMinimum( ( T )baseValue );
 
       return baseValue;
     }
@@ -401,7 +400,7 @@ MouseWheelActiveTrigger ), typeof( UpDownBase<T> ), new UIPropertyMetadata( Mous
     {
       get
       {
-        return (MouseWheelActiveTrigger)GetValue( MouseWheelActiveTriggerProperty );
+        return ( MouseWheelActiveTrigger )GetValue( MouseWheelActiveTriggerProperty );
       }
       set
       {
@@ -424,7 +423,7 @@ MouseWheelActiveTrigger ), typeof( UpDownBase<T> ), new UIPropertyMetadata( Mous
       get
       {
 #pragma warning disable 618
-        return (bool)GetValue( MouseWheelActiveOnFocusProperty );
+        return ( bool )GetValue( MouseWheelActiveOnFocusProperty );
 #pragma warning restore 618
       }
       set
@@ -439,7 +438,7 @@ MouseWheelActiveTrigger ), typeof( UpDownBase<T> ), new UIPropertyMetadata( Mous
     {
       UpDownBase<T> upDownBase = o as UpDownBase<T>;
       if( upDownBase != null )
-        upDownBase.MouseWheelActiveTrigger = ((bool)e.NewValue)
+        upDownBase.MouseWheelActiveTrigger = ( ( bool )e.NewValue )
           ? MouseWheelActiveTrigger.FocusedMouseOver
           : MouseWheelActiveTrigger.MouseOver;
     }
@@ -455,7 +454,7 @@ UpDownBase<T> ), new UIPropertyMetadata( true ) );
     {
       get
       {
-        return (bool)GetValue( ShowButtonSpinnerProperty );
+        return ( bool )GetValue( ShowButtonSpinnerProperty );
       }
       set
       {
@@ -467,13 +466,13 @@ UpDownBase<T> ), new UIPropertyMetadata( true ) );
 
     #region UpdateValueOnEnterKey
 
-    public static readonly DependencyProperty UpdateValueOnEnterKeyProperty = DependencyProperty.Register( "UpdateValueOnEnterKey", typeof( bool ), typeof( UpDownBase<T> ), 
+    public static readonly DependencyProperty UpdateValueOnEnterKeyProperty = DependencyProperty.Register( "UpdateValueOnEnterKey", typeof( bool ), typeof( UpDownBase<T> ),
       new FrameworkPropertyMetadata( false, OnUpdateValueOnEnterKeyChanged ) );
     public bool UpdateValueOnEnterKey
     {
       get
       {
-        return (bool)GetValue( UpdateValueOnEnterKeyProperty );
+        return ( bool )GetValue( UpdateValueOnEnterKeyProperty );
       }
       set
       {
@@ -496,13 +495,13 @@ UpDownBase<T> ), new UIPropertyMetadata( true ) );
 
     #region Value
 
-    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( T ), typeof( UpDownBase<T> ), 
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( T ), typeof( UpDownBase<T> ),
       new FrameworkPropertyMetadata( default( T ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged, OnCoerceValue, false, UpdateSourceTrigger.PropertyChanged ) );
     public T Value
     {
       get
       {
-        return (T)GetValue( ValueProperty );
+        return ( T )GetValue( ValueProperty );
       }
       set
       {
@@ -525,7 +524,7 @@ UpDownBase<T> ), new UIPropertyMetadata( true ) );
 
     private static object OnCoerceValue( DependencyObject o, object basevalue )
     {
-      return ((UpDownBase<T>)o).OnCoerceValue( basevalue );
+      return ( ( UpDownBase<T> )o ).OnCoerceValue( basevalue );
     }
 
     protected virtual object OnCoerceValue( object newValue )
@@ -537,7 +536,7 @@ UpDownBase<T> ), new UIPropertyMetadata( true ) );
     {
       UpDownBase<T> upDownBase = o as UpDownBase<T>;
       if( upDownBase != null )
-        upDownBase.OnValueChanged( (T)e.OldValue, (T)e.NewValue );
+        upDownBase.OnValueChanged( ( T )e.OldValue, ( T )e.NewValue );
     }
 
     protected virtual void OnValueChanged( T oldValue, T newValue )
@@ -693,9 +692,9 @@ true );
       {
         var activeTrigger = this.MouseWheelActiveTrigger;
         bool spin = !e.UsingMouseWheel;
-        spin |= (activeTrigger == MouseWheelActiveTrigger.MouseOver);
-        spin |= ( (TextBox  != null) && TextBox.IsFocused && (activeTrigger == MouseWheelActiveTrigger.FocusedMouseOver));
-        spin |= ( (TextBox != null) && TextBox.IsFocused && (activeTrigger == MouseWheelActiveTrigger.Focused) && (Mouse.Captured is Spinner));
+        spin |= ( activeTrigger == MouseWheelActiveTrigger.MouseOver );
+        spin |= ( ( TextBox != null ) && TextBox.IsFocused && ( activeTrigger == MouseWheelActiveTrigger.FocusedMouseOver ) );
+        spin |= ( ( TextBox != null ) && TextBox.IsFocused && ( activeTrigger == MouseWheelActiveTrigger.Focused ) && ( Mouse.Captured is Spinner ) );
 
         if( spin )
         {
@@ -769,9 +768,9 @@ RoutedPropertyChangedEventHandler<object> ), typeof( UpDownBase<T> ) );
       // To be sure that the value is not initialized, it should
       // have no local value, no binding, and equal to the default value.
       bool updateValueFromText =
-        (this.ReadLocalValue( ValueProperty ) == DependencyProperty.UnsetValue)
-        && (BindingOperations.GetBinding( this, ValueProperty ) == null)
-        && (object.Equals( this.Value, ValueProperty.DefaultMetadata.DefaultValue ));
+        ( this.ReadLocalValue( ValueProperty ) == DependencyProperty.UnsetValue )
+        && ( BindingOperations.GetBinding( this, ValueProperty ) == null )
+        && ( object.Equals( this.Value, ValueProperty.DefaultMetadata.DefaultValue ) );
 
       this.SyncTextAndValueProperties( updateValueFromText, Text, !updateValueFromText );
     }
@@ -781,7 +780,7 @@ RoutedPropertyChangedEventHandler<object> ), typeof( UpDownBase<T> ) );
     /// </summary>
     internal void DoDecrement()
     {
-      if( Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease )
+      if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Decrease ) == ValidSpinDirections.Decrease )
       {
         OnDecrement();
       }
@@ -792,7 +791,7 @@ RoutedPropertyChangedEventHandler<object> ), typeof( UpDownBase<T> ) );
     /// </summary>
     internal void DoIncrement()
     {
-      if( Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase )
+      if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Increase ) == ValidSpinDirections.Increase )
       {
         OnIncrement();
       }
@@ -806,7 +805,7 @@ RoutedPropertyChangedEventHandler<object> ), typeof( UpDownBase<T> ) );
       try
       {
         _isTextChangedFromUI = true;
-        Text = ((TextBox)sender).Text;
+        Text = ( ( TextBox )sender ).Text;
       }
       finally
       {
@@ -816,7 +815,7 @@ RoutedPropertyChangedEventHandler<object> ), typeof( UpDownBase<T> ) );
 
     private void UpDownBase_IsKeyboardFocusWithinChanged( object sender, DependencyPropertyChangedEventArgs e )
     {
-      if( !(bool)e.NewValue )
+      if( !( bool )e.NewValue )
       {
         this.CommitInput();
       }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
index a7707c2f..fba0b31f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/ValueRangeTextBox.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,21 +16,13 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Controls;
-using System.Windows;
-using System.Collections;
-using System.Reflection;
-using System.Windows.Input;
-using System.Windows.Documents;
-using System.Globalization;
-using Microsoft.Win32;
-using System.ComponentModel;
 using System.Collections.Specialized;
+using System.ComponentModel;
 using System.Diagnostics;
-using System.Windows.Automation;
-using Xceed.Wpf.Toolkit;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Core;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 
@@ -819,7 +811,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
       {
         if( this.BeepOnError )
         {
-          this.PlayBeep();          
+          this.PlayBeep();
         }
         return false;
       }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs
index 3da46972..d70881c5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowContainer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,8 +17,8 @@
 
 using System;
 using System.Linq;
-using System.Windows.Controls;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Media;
 
@@ -123,7 +123,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
         double height = double.IsNaN( this.Height )
                         ? this.Children.OfType<WindowControl>().Max( ( w ) => w.Top + w.DesiredSize.Height )
                         : this.Height;
-        return new Size( Math.Min( width, constraint.Width), Math.Min( height, constraint.Height) );
+        return new Size( Math.Min( width, constraint.Width ), Math.Min( height, constraint.Height ) );
       }
 
       return size;
@@ -316,7 +316,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
       if( ( windowControl.ActualWidth != 0 ) && ( windowControl.ActualHeight != 0 ) )
       {
         windowControl.Left = ( this.ActualWidth - windowControl.ActualWidth ) / 2.0;
-        windowControl.Left += (windowControl.Margin.Left - windowControl.Margin.Right);
+        windowControl.Left += ( windowControl.Margin.Left - windowControl.Margin.Right );
         windowControl.Top = ( this.ActualHeight - windowControl.ActualHeight ) / 2.0;
         windowControl.Top += ( windowControl.Margin.Top - windowControl.Margin.Bottom );
       }
@@ -377,15 +377,15 @@ namespace Xceed.Wpf.Toolkit.Primitives
 
     private bool IsModalWindow( WindowControl windowControl )
     {
-      return ( ( ( windowControl is MessageBox ) && (windowControl.Visibility == Visibility.Visible) )
-             || ( ( windowControl is ChildWindow ) && ( ( ChildWindow )windowControl ).IsModal && ( ( ChildWindow )windowControl).WindowState == WindowState.Open ) );
+      return ( ( ( windowControl is MessageBox ) && ( windowControl.Visibility == Visibility.Visible ) )
+             || ( ( windowControl is ChildWindow ) && ( ( ChildWindow )windowControl ).IsModal && ( ( ChildWindow )windowControl ).WindowState == WindowState.Open ) );
     }
 
     private WindowControl GetModalWindow()
     {
       return this.Children.OfType<WindowControl>()
                       .OrderByDescending( ( x ) => Canvas.GetZIndex( x ) )
-                      .FirstOrDefault( ( x ) => IsModalWindow( x ) && (x.Visibility == Visibility.Visible) );
+                      .FirstOrDefault( ( x ) => IsModalWindow( x ) && ( x.Visibility == Visibility.Visible ) );
     }
 
     private double GetRestrictedLeft( WindowControl windowControl )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs
index 24b3d508..ce4ccf9c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Primitives/WindowControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,23 +16,19 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
+using System.IO;
 using System.Windows;
-using System.Windows.Media;
+using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
 using System.Windows.Input;
-using System.IO;
+using System.Windows.Media;
 using Xceed.Wpf.Toolkit.Core;
-using System.ComponentModel;
 
 namespace Xceed.Wpf.Toolkit.Primitives
 {
   [TemplatePart( Name = PART_HeaderThumb, Type = typeof( Thumb ) )]
   [TemplatePart( Name = PART_Icon, Type = typeof( Image ) )]
-  [TemplatePart( Name = PART_CloseButton, Type = typeof( Button ) )]  
+  [TemplatePart( Name = PART_CloseButton, Type = typeof( Button ) )]
   [TemplatePart( Name = PART_ToolWindowCloseButton, Type = typeof( Button ) )]
   [TemplatePart( Name = PART_BlockMouseInputsBorder, Type = typeof( Border ) )]
   [TemplatePart( Name = PART_HeaderGrid, Type = typeof( Grid ) )]
@@ -100,7 +96,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
     {
       get
       {
-        return (double)GetValue( CaptionFontSizeProperty );
+        return ( double )GetValue( CaptionFontSizeProperty );
       }
       set
       {
@@ -398,6 +394,9 @@ namespace Xceed.Wpf.Toolkit.Primitives
 
 
 
+
+
+
     #region WindowBackground
 
     public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( WindowControl ), new PropertyMetadata( null ) );
@@ -572,7 +571,7 @@ namespace Xceed.Wpf.Toolkit.Primitives
       {
         if( value != _IsBlockMouseInputsPanelActive )
         {
-          _IsBlockMouseInputsPanelActive = value;         
+          _IsBlockMouseInputsPanelActive = value;
           this.UpdateBlockMouseInputsPanel();
         }
       }
@@ -584,7 +583,10 @@ namespace Xceed.Wpf.Toolkit.Primitives
 
     internal virtual bool AllowPublicIsActiveChange
     {
-      get { return true; }
+      get
+      {
+        return true;
+      }
     }
 
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
index 2881bf7e..e8584680 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -37,7 +37,7 @@ using System.Windows.Markup;
 
 [assembly: AssemblyCompany("Xceed Software Inc.")]
 [assembly: AssemblyProduct( "Xceed Toolkit for WPF" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2021" )]
+[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2022" )]
 [assembly: AssemblyCulture( "" )]
 
 
@@ -102,7 +102,11 @@ using System.Windows.Markup;
 
 #pragma warning disable 1699
 [assembly: AssemblyDelaySign( false )]
+#if NETCORE || NET5
+[assembly: AssemblyKeyFile( @"..\..\..\..\sn.snk" )]
+#else
 [assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
+#endif
 [assembly: AssemblyKeyName( "" )]
 #pragma warning restore 1699
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs
index 4cd51195..3856adba 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryOrderAttribute.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -73,7 +73,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Attributes
     }
 
     public CategoryOrderAttribute( string categoryName, int order )
-      :this()
+      : this()
     {
       CategoryValue = categoryName;
       Order = order;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryPropertyOrderAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryPropertyOrderAttribute.cs
index 33a35794..cf2825c1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryPropertyOrderAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/CategoryPropertyOrderAttribute.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
index d7a7097e..6e191425 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
index 5d412647..1dc8595a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/IItemsSource.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
index 4486c2bb..3c0252b1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs
index b783205f..a7197143 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/NewItemTypesAttribute.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
index 02eee3a1..d0451097 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs
index 23b5d4c5..e85be03f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CategoryGroupStyleSelector.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -40,7 +40,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     {
       var group = item as CollectionViewGroup;
       // Category is not "Misc" => use regular ItemGroupStyle
-      if( (group.Name != null) && !group.Name.Equals( CategoryAttribute.Default.Category ) )
+      if( ( group.Name != null ) && !group.Name.Equals( CategoryAttribute.Default.Category ) )
         return this.ItemGroupStyle;
 
       // Category is "Misc"
@@ -55,7 +55,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       if( itemsControl != null )
       {
         // Category is "Misc" and this is the only category => use SingleDefaultCategoryItemGroupContainerStyle
-        if( (itemsControl.Items.Count > 0) && (itemsControl.Items.Groups.Count == 1) )
+        if( ( itemsControl.Items.Count > 0 ) && ( itemsControl.Items.Groups.Count == 1 ) )
           return this.SingleDefaultCategoryItemGroupStyle;
       }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
index 3b4afa6a..5d5d75d1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
index 1db38e42..366b33ca 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs
index 9d3310e5..804aa3aa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CommonPropertyExceptionValidationRule.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,13 +16,10 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Controls;
 using System.ComponentModel;
-using Xceed.Wpf.Toolkit.Core.Utilities;
 using System.Globalization;
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs
index ce766577..9dbc1d81 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ContainerHelperBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,16 +15,14 @@
 
   ***********************************************************************************/
 
-using System.Collections.Generic;
-using System.Collections;
 using System;
-using System.Windows;
+using System.Collections;
 using System.ComponentModel;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Data;
-using System.Diagnostics;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
@@ -32,7 +30,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
   {
     protected readonly IPropertyContainer PropertyContainer;
 
-    public ContainerHelperBase(IPropertyContainer propertyContainer)
+    public ContainerHelperBase( IPropertyContainer propertyContainer )
     {
       if( propertyContainer == null )
         throw new ArgumentNullException( "propertyContainer" );
@@ -106,7 +104,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       this.IsCleaning = false;
     }
 
-    public virtual void PrepareChildrenPropertyItem( PropertyItemBase propertyItem, object item ) 
+    public virtual void PrepareChildrenPropertyItem( PropertyItemBase propertyItem, object item )
     {
       // Initialize the parent node
       propertyItem.ParentNode = PropertyContainer;
@@ -163,30 +161,44 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       {
         this.OnHideInheritedPropertiesChanged();
       }
-      else if(propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.EditorDefinitions ))
+      else if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.EditorDefinitions ) )
       {
         this.OnEditorDefinitionsChanged();
       }
-      else if(propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.PropertyDefinitions ))
+      else if( propertyName == ReflectionHelper.GetPropertyOrFieldName( () => ps.PropertyDefinitions ) )
       {
         this.OnPropertyDefinitionsChanged();
       }
     }
 
-    protected virtual void OnCategorizationChanged() { }
+    protected virtual void OnCategorizationChanged()
+    {
+    }
 
-    protected virtual void OnFilterChanged() { }
+    protected virtual void OnFilterChanged()
+    {
+    }
 
-    protected virtual void OnAutoGeneratePropertiesChanged() { }
+    protected virtual void OnAutoGeneratePropertiesChanged()
+    {
+    }
 
-    protected virtual void OnHideInheritedPropertiesChanged() { }
+    protected virtual void OnHideInheritedPropertiesChanged()
+    {
+    }
 
-    protected virtual void OnEditorDefinitionsChanged() { }
+    protected virtual void OnEditorDefinitionsChanged()
+    {
+    }
 
-    protected virtual void OnPropertyDefinitionsChanged() { }
+    protected virtual void OnPropertyDefinitionsChanged()
+    {
+    }
 
 
-    public virtual void OnEndInit() { }
+    public virtual void OnEndInit()
+    {
+    }
 
     public abstract PropertyItemBase ContainerFromItem( object item );
 
@@ -194,8 +206,12 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public abstract Binding CreateChildrenDefaultBinding( PropertyItemBase propertyItem );
 
-    public virtual void NotifyEditorDefinitionsCollectionChanged() { }
-    public virtual void NotifyPropertyDefinitionsCollectionChanged() { }
+    public virtual void NotifyEditorDefinitionsCollectionChanged()
+    {
+    }
+    public virtual void NotifyPropertyDefinitionsCollectionChanged()
+    {
+    }
 
     public abstract void UpdateValuesFromSource();
 
@@ -204,7 +220,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       foreach( var item in this.Properties )
       {
         var propertyItem = item as PropertyItemBase;
-        if( (propertyItem != null) && propertyItem.IsExpandable )
+        if( ( propertyItem != null ) && propertyItem.IsExpandable )
         {
           if( propertyItem.ContainerHelper != null )
           {
@@ -220,7 +236,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       foreach( var item in this.Properties )
       {
         var propertyItem = item as PropertyItemBase;
-        if( (propertyItem != null) && propertyItem.IsExpandable )
+        if( ( propertyItem != null ) && propertyItem.IsExpandable )
         {
           if( propertyItem.DisplayName == propertyName )
           {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs
index e32301bb..4edad8da 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/EditorTimeSpanConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -29,7 +29,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
   /// </summary>
   public sealed class EditorTimeSpanConverter : IValueConverter
   {
-    public bool AllowNulls { get; set; }
+    public bool AllowNulls
+    {
+      get; set;
+    }
 
     object IValueConverter.Convert( object value, Type targetType, object parameter, CultureInfo culture )
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
index 528a5cb2..4f3908e5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs
index 71420738..6a9e14e3 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsDefaultCategoryConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,11 +16,8 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs
index d607d91e..04e9ab97 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/IsStringEmptyConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs
index 7c7ca8cf..a8b32106 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ListConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,12 +16,12 @@
   ***********************************************************************************/
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
-using System.ComponentModel;
-using System.Collections;
-using System.Collections.ObjectModel;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs
index 0ff1ed19..d9265ac5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/ObjectToUIElementConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,10 +16,7 @@
   ***********************************************************************************/
 
 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;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs
index 7a62ad9b..7846a801 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyItemEditorConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -43,7 +43,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
       var editorIsReadOnlyPropertyInfo = editorType.GetProperty( "IsReadOnly" );
       if( editorIsReadOnlyPropertyInfo != null )
       {
-        if( !this.IsPropertySetLocally( editor, TextBoxBase.IsReadOnlyProperty )  )
+        if( !this.IsPropertySetLocally( editor, TextBoxBase.IsReadOnlyProperty ) )
         {
           // Set Editor.IsReadOnly to PropertyGrid.IsReadOnly & propertyItem.IsReadOnly.
           var isReadOnlyValue = isPropertyGridReadOnly.Value
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyNameTextTrimmingConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyNameTextTrimmingConverter.cs
index 17bf9d92..9a56f62a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyNameTextTrimmingConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/PropertyNameTextTrimmingConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -26,7 +26,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
     public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
       var textWrapping = ( TextWrapping )value;
-      return (textWrapping == TextWrapping.NoWrap) ? TextTrimming.CharacterEllipsis : TextTrimming.None;
+      return ( textWrapping == TextWrapping.NoWrap ) ? TextTrimming.CharacterEllipsis : TextTrimming.None;
     }
 
     public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
index f58178bf..bac25c9d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Converters/SelectedObjectConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,14 +16,11 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using System.Globalization;
 using System.ComponentModel;
-using System.Windows;
+using System.Globalization;
+using System.Linq;
 using System.Reflection;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
 {
@@ -40,7 +37,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
       if( !( parameter is string ) )
         throw new ArgumentException( SelectedObjectConverter.ValidParameterMessage );
 
-      if( this.CompareParam(parameter, "Type") )
+      if( this.CompareParam( parameter, "Type" ) )
       {
         return this.ConvertToType( value, culture );
       }
@@ -58,7 +55,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
       }
     }
 
-    private bool CompareParam(object parameter, string parameterValue )
+    private bool CompareParam( object parameter, string parameterValue )
     {
       return string.Compare( ( string )parameter, parameterValue, true ) == 0;
     }
@@ -86,8 +83,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Converters
 
       DisplayNameAttribute displayNameAttribute = newType.GetCustomAttributes( false ).OfType<DisplayNameAttribute>().FirstOrDefault();
 
-      return (displayNameAttribute == null)
-        ? newType.Name 
+      return ( displayNameAttribute == null )
+        ? newType.Name
         : displayNameAttribute.DisplayName;
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs
index 295f5842..ffdea542 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/CustomPropertyItem.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,11 +16,7 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
-using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
@@ -55,8 +51,14 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public string Category
     {
-      get { return ( string )GetValue( CategoryProperty ); }
-      set { SetValue( CategoryProperty, value ); }
+      get
+      {
+        return ( string )GetValue( CategoryProperty );
+      }
+      set
+      {
+        SetValue( CategoryProperty, value );
+      }
     }
 
     #endregion //Category
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs
index dec32a54..82403f43 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/DefinitionBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,16 +16,10 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
+using System.Linq.Expressions;
 using System.Windows;
 using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Linq.Expressions;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
@@ -35,7 +29,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     internal bool IsLocked
     {
-      get { return _isLocked; }
+      get
+      {
+        return _isLocked;
+      }
     }
 
     internal void ThrowIfLocked<TMember>( Expression<Func<TMember>> propertyExpression )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs
index 848959b4..ed4bf684 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorDefinitionBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,15 +15,7 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Collections;
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
@@ -32,12 +24,15 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     internal EditorDefinitionBase() { }
 
-    internal FrameworkElement GenerateEditingElementInternal( PropertyItemBase propertyItem ) 
+    internal FrameworkElement GenerateEditingElementInternal( PropertyItemBase propertyItem )
     {
       return this.GenerateEditingElement( propertyItem );
     }
 
-    protected virtual FrameworkElement GenerateEditingElement( PropertyItemBase propertyItem ) { return null; }
+    protected virtual FrameworkElement GenerateEditingElement( PropertyItemBase propertyItem )
+    {
+      return null;
+    }
 
     internal void UpdateProperty( FrameworkElement element, DependencyProperty elementProp, DependencyProperty definitionProperty )
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs
index 0f46d6e1..d0cb8fd7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/EditorTemplateDefinition.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,10 +15,6 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
@@ -33,8 +29,14 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public DataTemplate EditingTemplate
     {
-      get { return ( DataTemplate )GetValue( EditingTemplateProperty ); }
-      set { SetValue( EditingTemplateProperty, value ); }
+      get
+      {
+        return ( DataTemplate )GetValue( EditingTemplateProperty );
+      }
+      set
+      {
+        SetValue( EditingTemplateProperty, value );
+      }
     }
     #endregion //EditingTemplate
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs
index 0402d382..fae47392 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Definitions/PropertyDefinitionBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -39,14 +39,17 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #region TargetProperties
 
-    [TypeConverter(typeof(ListConverter))]
-    public IList TargetProperties 
+    [TypeConverter( typeof( ListConverter ) )]
+    public IList TargetProperties
     {
-      get { return _targetProperties; }
-      set 
+      get
+      {
+        return _targetProperties;
+      }
+      set
       {
         this.ThrowIfLocked( () => this.TargetProperties );
-        _targetProperties = value; 
+        _targetProperties = value;
       }
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
index b6d4f261..934604f6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinition.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -98,7 +98,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
         Mode = PropertyDescriptor.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay,
         ValidatesOnDataErrors = true,
         ValidatesOnExceptions = true,
-        ConverterCulture = CultureInfo.CurrentCulture 
+        ConverterCulture = CultureInfo.CurrentCulture
       };
 
       return binding;
@@ -119,7 +119,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       if( !PropertyDescriptor.IsReadOnly )
       {
         var defaultValue = this.ComputeDefaultValueAttribute();
-        if( defaultValue != null)
+        if( defaultValue != null )
           return !defaultValue.Equals( this.Value ); // can Reset if different from defaultValue.
 
         return PropertyDescriptor.CanResetValue( SelectedObject );
@@ -207,7 +207,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
               var assembly = AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault( a => a.FullName.Contains( typeDef[ 1 ].Trim() ) );
               if( assembly != null )
               {
-                type = assembly.GetTypes().FirstOrDefault( t => (t != null) && (t.FullName != null) && t.FullName.Contains( typeDef[ 0 ] ) );
+                type = assembly.GetTypes().FirstOrDefault( t => ( t != null ) && ( t.FullName != null ) && t.FullName.Contains( typeDef[ 0 ] ) );
               }
             }
           }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
index 177047e4..9509f585 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/DescriptorPropertyDefinitionBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -25,7 +25,6 @@ using System.Windows.Media;
 using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
 using System.Diagnostics;
 using System.ComponentModel;
-using System.Windows.Markup.Primitives;
 using System.Windows.Data;
 #if !VS2008
 using System.ComponentModel.DataAnnotations;
@@ -249,7 +248,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     internal void UpdateIsExpandable()
     {
-      this.IsExpandable = this.ComputeIsExpandable() 
+      this.IsExpandable = this.ComputeIsExpandable()
                           && ( this.ExpandableAttribute
                              );
     }
@@ -283,7 +282,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 #endif
 
       var descriptionAtt = PropertyGridUtilities.GetAttribute<DescriptionAttribute>( pd );
-      return (descriptionAtt != null)
+      return ( descriptionAtt != null )
               ? descriptionAtt.Description
               : pd.Description;
     }
@@ -293,7 +292,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       PropertyDescriptor pd = item as PropertyDescriptor;
       var attribute = PropertyGridUtilities.GetAttribute<NewItemTypesAttribute>( pd );
 
-      return (attribute != null)
+      return ( attribute != null )
               ? attribute.Types
               : null;
     }
@@ -323,15 +322,15 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
         if( this.IsPropertyGridCategorized )
         {
-          var attribute = list.FirstOrDefault( x => ((x.UsageContext == UsageContextEnum.Categorized)
-                                                    || (x.UsageContext == UsageContextEnum.Both)) );
+          var attribute = list.FirstOrDefault( x => ( ( x.UsageContext == UsageContextEnum.Categorized )
+                                                    || ( x.UsageContext == UsageContextEnum.Both ) ) );
           if( attribute != null )
             return attribute.Order;
         }
         else
         {
-          var attribute = list.FirstOrDefault( x => ((x.UsageContext == UsageContextEnum.Alphabetical)
-                                                    || (x.UsageContext == UsageContextEnum.Both)) );
+          var attribute = list.FirstOrDefault( x => ( ( x.UsageContext == UsageContextEnum.Alphabetical )
+                                                    || ( x.UsageContext == UsageContextEnum.Both ) ) );
           if( attribute != null )
             return attribute.Order;
         }
@@ -343,10 +342,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     internal object ComputeExpandableAttributeForItem( object item )
     {
-      var pd = (PropertyDescriptor)item;
+      var pd = ( PropertyDescriptor )item;
 
       var attribute = PropertyGridUtilities.GetAttribute<ExpandableObjectAttribute>( pd );
-      return (attribute != null);
+      return ( attribute != null );
     }
 
     internal int ComputeDisplayOrderInternal( bool isPropertyGridCategorized )
@@ -400,7 +399,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
         affectedPropertyItem = sender as PropertyItem;
       }
 
-      e.CanExecute = ( (affectedPropertyItem != null) && ( affectedPropertyItem.DescriptorDefinition != null) ) 
+      e.CanExecute = ( ( affectedPropertyItem != null ) && ( affectedPropertyItem.DescriptorDefinition != null ) )
                       ? affectedPropertyItem.DescriptorDefinition.ComputeCanResetValue()
                       : false;
     }
@@ -411,11 +410,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
         var displayName = PropertyDescriptor.DisplayName;
 #else
       var displayAttribute = PropertyGridUtilities.GetAttribute<DisplayAttribute>( PropertyDescriptor );
-      var displayName = (displayAttribute != null) ? displayAttribute.GetName() : PropertyDescriptor.DisplayName;
+      var displayName = ( displayAttribute != null ) ? displayAttribute.GetName() : PropertyDescriptor.DisplayName;
 #endif
 
       var attribute = PropertyGridUtilities.GetAttribute<ParenthesizePropertyNameAttribute>( PropertyDescriptor );
-      if( (attribute != null) && attribute.NeedParenthesis )
+      if( ( attribute != null ) && attribute.NeedParenthesis )
       {
         displayName = "(" + displayName + ")";
       }
@@ -428,7 +427,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       if( list.Count > 0 )
       {
         PropertyOrderAttribute both = list.FirstOrDefault( x => x.UsageContext == UsageContextEnum.Both );
-        if( (both != null) && (list.Count > 1) )
+        if( ( both != null ) && ( list.Count > 1 ) )
           Debug.Assert( false, "A PropertyItem can't have more than 1 PropertyOrderAttribute when it has UsageContext : Both" );
       }
     }
@@ -450,7 +449,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     {
       get
       {
-        return (ImageSource)GetValue( AdvancedOptionsIconProperty );
+        return ( ImageSource )GetValue( AdvancedOptionsIconProperty );
       }
       set
       {
@@ -469,7 +468,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     {
       get
       {
-        return (object)GetValue( AdvancedOptionsTooltipProperty );
+        return ( object )GetValue( AdvancedOptionsTooltipProperty );
       }
       set
       {
@@ -488,7 +487,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     {
       get
       {
-        return (bool)GetValue( IsExpandableProperty );
+        return ( bool )GetValue( IsExpandableProperty );
       }
       set
       {
@@ -652,7 +651,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
     {
-      ((DescriptorPropertyDefinitionBase)o).OnValueChanged( e.OldValue, e.NewValue );
+      ( ( DescriptorPropertyDefinitionBase )o ).OnValueChanged( e.OldValue, e.NewValue );
     }
 
     internal virtual void OnValueChanged( object oldValue, object newValue )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
index 9108c7a0..2d2f790c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/EditorDefinition.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,13 +16,13 @@
   ***********************************************************************************/
 
 using System;
-using System.Windows;
 using System.Collections.Generic;
 using System.Linq;
+using System.Windows;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
-  [Obsolete(@"Use EditorTemplateDefinition instead of EditorDefinition. " + EditorDefinition.UsageEx)]
+  [Obsolete( @"Use EditorTemplateDefinition instead of EditorDefinition. " + EditorDefinition.UsageEx )]
   public class EditorDefinition : EditorTemplateDefinition
   {
     private const string UsageEx = " (XAML Ex: <t:EditorTemplateDefinition TargetProperties=\"FirstName,LastName\" .../> OR <t:EditorTemplateDefinition TargetProperties=\"{x:Type l:MyType}\" .../> )";
@@ -76,7 +76,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       if( this.EditingTemplate != null )
         throw new InvalidOperationException( string.Format( usageError, "EditingTemplate" ) );
 
-      if( this.TargetProperties != null && this.TargetProperties.Count > 0)
+      if( this.TargetProperties != null && this.TargetProperties.Count > 0 )
         throw new InvalidOperationException( string.Format( usageError, "TargetProperties" ) );
 
       List<object> properties = new List<object>();
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
index 0a76533f..ab5378e0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 15c34dfb..ab57f636 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/CollectionEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,7 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Linq;
 using System.Windows;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 
@@ -82,7 +80,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
             propertyGrid.RaiseEvent( new PropertyValueChangedEventArgs( PropertyGrid.PropertyValueChangedEvent, propertyItem, null, propertyItem.Instance ) );
           }
         }
-      }      
+      }
     }
 
     protected override void ResolveValueBinding( PropertyItem propertyItem )
@@ -95,11 +93,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
       {
         Editor.NewItemTypes = new List<Type>() { type.GetElementType() };
       }
-      else 
+      else
       {
-        if( (propertyItem.DescriptorDefinition != null)
-            && (propertyItem.DescriptorDefinition.NewItemTypes != null)
-            && (propertyItem.DescriptorDefinition.NewItemTypes.Count > 0) )
+        if( ( propertyItem.DescriptorDefinition != null )
+            && ( propertyItem.DescriptorDefinition.NewItemTypes != null )
+            && ( propertyItem.DescriptorDefinition.NewItemTypes.Count > 0 ) )
         {
           Editor.NewItemTypes = propertyItem.DescriptorDefinition.NewItemTypes;
         }
@@ -107,7 +105,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
         {
           //Check if we have a Dictionary
           var dictionaryTypes = ListUtilities.GetDictionaryItemsType( type );
-          if( (dictionaryTypes != null) && (dictionaryTypes.Length == 2) )
+          if( ( dictionaryTypes != null ) && ( dictionaryTypes.Length == 2 ) )
           {
             // A Dictionary contains KeyValuePair that can't be edited.
             // We need to create EditableKeyValuePairs.
@@ -119,7 +117,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
           {
             //Check if we have a list
             var listType = ListUtilities.GetListItemType( type );
-            if( listType != null  )
+            if( listType != null )
             {
               Editor.NewItemTypes = new List<Type>() { listType };
             }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
index aaa3a8d9..85cfe4e7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ColorEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
index bd0e2cd8..8576fe2a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,7 +15,6 @@
 
   ***********************************************************************************/
 
-using System.Collections.Generic;
 using System.Collections;
 using System.Windows;
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
index 84353d74..56e05b16 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,11 +16,11 @@
   ***********************************************************************************/
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
-using System.Collections;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
index 6df3b3ac..1c813425 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,11 +15,10 @@
 
   ***********************************************************************************/
 
-using System.Collections.Generic;
+using System.Collections;
 using System.Linq;
 using System.Windows;
 using System.Windows.Media;
-using System.Collections;
 using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
@@ -29,7 +28,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
     protected override IEnumerable CreateItemsSource( PropertyItem propertyItem )
     {
       if( propertyItem.PropertyType == typeof( FontFamily ) )
-        return FontUtilities.Families.OrderBy( x => x.Source);
+        return FontUtilities.Families.OrderBy( x => x.Source );
       else if( propertyItem.PropertyType == typeof( FontWeight ) )
         return FontUtilities.Weights;
       else if( propertyItem.PropertyType == typeof( FontStyle ) )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
index f1f7afe8..670412fe 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ITypeEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
index 45c63651..f76b9663 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 7e51a0cd..1cace694 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/MaskedTextBoxEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,11 +16,7 @@
   ***********************************************************************************/
 
 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
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PasswordEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PasswordEditor.cs
index e8d96c7f..da554962 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PasswordEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PasswordEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -36,7 +36,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 
     protected override IValueConverter CreateValueConverter()
     {
-      return new PasswordToStringConverter(this.Editor);
+      return new PasswordToStringConverter( this.Editor );
     }
   }
 
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 7219d310..cd6fc7bc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs
index 29297811..e2ec1188 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/SourceComboBoxEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -34,8 +34,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
     public SourceComboBoxEditor( ICollection collection, TypeConverter typeConverter )
     {
       // Add a "Null" input value in the ComboBox when using a NullableConverter.
-      _collection = (typeConverter is NullableConverter) 
-                    ? collection.Cast<object>().Select( x => x ?? SourceComboBoxEditor.ComboBoxNullValue ).ToArray() 
+      _collection = ( typeConverter is NullableConverter )
+                    ? collection.Cast<object>().Select( x => x ?? SourceComboBoxEditor.ComboBoxNullValue ).ToArray()
                     : collection;
       _typeConverter = typeConverter;
     }
@@ -73,8 +73,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
     {
       if( _typeConverter != null )
       {
-        if( _typeConverter.CanConvertTo( typeof(string) ) )
-          return _typeConverter.ConvertTo( value, typeof(string) );
+        if( _typeConverter.CanConvertTo( typeof( string ) ) )
+          return _typeConverter.ConvertTo( value, typeof( string ) );
       }
       return value;
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
index b47ba60c..fe5a6e91 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,13 +15,13 @@
 
   ***********************************************************************************/
 
-using System.Windows.Controls;
-using System.Windows;
+using System;
 using System.ComponentModel;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Data;
 using Xceed.Wpf.Toolkit.Core;
-using System;
-using System.Globalization;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
index a6512ef4..6c577550 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
index 55087688..19ca1429 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/TypeEditor.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -67,7 +67,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
     {
       var _binding = new Binding( "Value" );
       _binding.Source = propertyItem;
-      _binding.UpdateSourceTrigger = (Editor is InputBase) ? UpdateSourceTrigger.PropertyChanged : UpdateSourceTrigger.Default;
+      _binding.UpdateSourceTrigger = ( Editor is InputBase ) ? UpdateSourceTrigger.PropertyChanged : UpdateSourceTrigger.Default;
       _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
       _binding.Converter = CreateValueConverter();
       BindingOperations.SetBinding( Editor, ValueProperty, _binding );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
index 745fd0b8..6cbc4d4e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/Editors/UpDownEditors.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -42,8 +42,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
       var rangeAttribute = PropertyGridUtilities.GetAttribute<RangeAttribute>( propertyDescriptor );
       if( rangeAttribute != null )
       {
-        Editor.Maximum = ((TType)converter.ConvertFrom( rangeAttribute.Maximum.ToString() ));
-        Editor.Minimum = ((TType)converter.ConvertFrom( rangeAttribute.Minimum.ToString() ));
+        Editor.Maximum = ( ( TType )converter.ConvertFrom( rangeAttribute.Maximum.ToString() ) );
+        Editor.Minimum = ( ( TType )converter.ConvertFrom( rangeAttribute.Minimum.ToString() ) );
       }
     }
 #endif
@@ -95,7 +95,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
     }
   }
 
-  public class DoubleUpDownEditor : NumericUpDownEditor<DoubleUpDown, double?> 
+  public class DoubleUpDownEditor : NumericUpDownEditor<DoubleUpDown, double?>
   {
     protected override DoubleUpDown CreateEditor()
     {
@@ -108,7 +108,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
       Editor.AllowInputSpecialValues = AllowedSpecialValues.Any;
 
 #if !VS2008
-      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( double ) ) );      
+      this.SetMinMaxFromRangeAttribute( propertyItem.PropertyDescriptor, TypeDescriptor.GetConverter( typeof( double ) ) );
 #endif
     }
   }
@@ -161,7 +161,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid.Editors
     }
   }
 
-  public class SingleUpDownEditor : NumericUpDownEditor<SingleUpDown, float?> 
+  public class SingleUpDownEditor : NumericUpDownEditor<SingleUpDown, float?>
   {
     protected override SingleUpDown CreateEditor()
     {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs
index 736cf69e..f01e240e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/FilterInfo.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
index 0822d16e..78f0d0fb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/IPropertyContainer.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,12 +17,9 @@
 
 
 using System.Collections.Generic;
-using System.Windows.Controls;
-using System.Collections;
 using System.ComponentModel;
-using System.Windows.Data;
-using System;
 using System.Windows;
+using System.Windows.Data;
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
   internal interface IPropertyContainer
@@ -34,23 +31,50 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
 
 
-    ContainerHelperBase ContainerHelper { get; }
+    ContainerHelperBase ContainerHelper
+    {
+      get;
+    }
 
-    Style PropertyContainerStyle { get; }
+    Style PropertyContainerStyle
+    {
+      get;
+    }
 
-    EditorDefinitionCollection EditorDefinitions { get; }
+    EditorDefinitionCollection EditorDefinitions
+    {
+      get;
+    }
 
-    PropertyDefinitionCollection PropertyDefinitions { get; }
+    PropertyDefinitionCollection PropertyDefinitions
+    {
+      get;
+    }
 
-    bool IsCategorized { get; }
+    bool IsCategorized
+    {
+      get;
+    }
 
-    bool IsSortedAlphabetically { get; }
+    bool IsSortedAlphabetically
+    {
+      get;
+    }
 
-    bool AutoGenerateProperties { get; }
+    bool AutoGenerateProperties
+    {
+      get;
+    }
 
-    bool HideInheritedProperties { get; }
+    bool HideInheritedProperties
+    {
+      get;
+    }
 
-    FilterInfo FilterInfo { get; }
+    FilterInfo FilterInfo
+    {
+      get;
+    }
 
     bool? IsPropertyVisible( PropertyDescriptor pd );
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
index 08bd8543..8e286fbd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelper.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -82,8 +82,8 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
               if( displayAttribute != null )
               {
                 var autoGenerateField = displayAttribute.GetAutoGenerateField();
-                isBrowsable = this.PropertyContainer.AutoGenerateProperties 
-                              && ((autoGenerateField.HasValue && autoGenerateField.Value) || !autoGenerateField.HasValue);
+                isBrowsable = this.PropertyContainer.AutoGenerateProperties
+                              && ( ( autoGenerateField.HasValue && autoGenerateField.Value ) || !autoGenerateField.HasValue );
               }
               else
 #endif
@@ -121,7 +121,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     private PropertyItem CreatePropertyItem( PropertyDescriptor property, PropertyDefinition propertyDef )
     {
-      DescriptorPropertyDefinition definition = new DescriptorPropertyDefinition( property, SelectedObject, this.PropertyContainer );                                                                                 
+      DescriptorPropertyDefinition definition = new DescriptorPropertyDefinition( property, SelectedObject, this.PropertyContainer );
       definition.InitProperties();
 
       this.InitializeDescriptorDefinition( definition, propertyDef );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
index 9cf1c473..01693801 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/ObjectContainerHelperBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,21 +16,20 @@
   ***********************************************************************************/
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Windows;
+using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Core.Utilities;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Collections;
-using System.Collections.ObjectModel;
-using System.Windows.Controls.Primitives;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using System.Windows.Controls;
+using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
@@ -44,7 +43,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     private bool _isPreparingItemFlag = false;
     private PropertyItemCollection _propertyItemCollection;
 
-    public ObjectContainerHelperBase( IPropertyContainer propertyContainer)
+    public ObjectContainerHelperBase( IPropertyContainer propertyContainer )
       : base( propertyContainer )
     {
       _propertyItemCollection = new PropertyItemCollection( new ObservableCollection<PropertyItem>() );
@@ -55,12 +54,15 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public override IList Properties
     {
-      get { return _propertyItemCollection; }
+      get
+      {
+        return _propertyItemCollection;
+      }
     }
 
     private PropertyItem DefaultProperty
     {
-      get 
+      get
       {
         PropertyItem defaultProperty = null;
         var defaultName = this.GetDefaultPropertyName();
@@ -115,7 +117,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       return propertyItem.PropertyDescriptor.Name;
     }
 
-    public override void  UpdateValuesFromSource()
+    public override void UpdateValuesFromSource()
     {
       foreach( PropertyItem item in PropertyItems )
       {
@@ -126,7 +128,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public void GenerateProperties()
     {
-      if( (PropertyItems.Count == 0)
+      if( ( PropertyItems.Count == 0 )
         )
       {
         this.RegenerateProperties();
@@ -199,7 +201,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     private void UpdateCategorization( bool updateSubPropertiesCategorization )
     {
       _propertyItemCollection.UpdateCategorization( this.ComputeCategoryGroupDescription(), this.PropertyContainer.IsCategorized, this.PropertyContainer.IsSortedAlphabetically );
-      if( updateSubPropertiesCategorization && (_propertyItemCollection.Count > 0) )
+      if( updateSubPropertiesCategorization && ( _propertyItemCollection.Count > 0 ) )
       {
         foreach( PropertyItem propertyItem in _propertyItemCollection )
         {
@@ -291,7 +293,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       {
         if( instance is ICustomTypeDescriptor )
         {
-          descriptors = ((ICustomTypeDescriptor)instance).GetProperties();
+          descriptors = ( ( ICustomTypeDescriptor )instance ).GetProperties();
         }
         //ICustomTypeProvider is only available in .net 4.5 and over. Use reflection so the .net 4.0 and .net 3.5 still works.
         else if( instance.GetType().GetInterface( "ICustomTypeProvider", true ) != null )
@@ -431,7 +433,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
         type = type.GetProperty( "Value" ).PropertyType;
       }
 
-      return ( type.IsValueType ? Activator.CreateInstance( type ) : null ) ;
+      return ( type.IsValueType ? Activator.CreateInstance( type ) : null );
     }
 
     private void SetupDefinitionBinding<T>(
@@ -466,7 +468,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
         editorElement = editor.ResolveEditor( propertyItem );
 
 
-      if( (editorElement == null) && (definitionKey == null) && ( propertyItem.PropertyDescriptor != null ) )
+      if( ( editorElement == null ) && ( definitionKey == null ) && ( propertyItem.PropertyDescriptor != null ) )
         editorElement = this.GenerateCustomEditingElement( propertyItem.PropertyDescriptor.Name, propertyItem );
 
       if( editorElement == null && definitionKeyAsType == null )
@@ -479,7 +481,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
           && !ListUtilities.IsCollectionOfItems( propertyItem.PropertyType )
           && !ListUtilities.IsDictionaryOfItems( propertyItem.PropertyType ) )
         {
-          editor = new TextBlockEditor( (propertyItem.PropertyDescriptor != null) ? propertyItem.PropertyDescriptor.Converter : null );
+          editor = new TextBlockEditor( ( propertyItem.PropertyDescriptor != null ) ? propertyItem.PropertyDescriptor.Converter : null );
         }
 
         // Fallback: Use a default type editor.
@@ -536,7 +538,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public override void ClearChildrenPropertyItem( PropertyItemBase propertyItem, object item )
     {
-      if( propertyItem.Editor != null 
+      if( propertyItem.Editor != null
         && ContainerHelperBase.GetIsGenerated( propertyItem.Editor ) )
       {
         propertyItem.Editor = null;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs
index 392fb6c1..5e9efaaf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinition.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -29,31 +29,40 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     private string _category = null;
     private int? _displayOrder = null;
 
-    [Obsolete(@"Use 'TargetProperties' instead of 'Name'")]
+    [Obsolete( @"Use 'TargetProperties' instead of 'Name'" )]
     public string Name
     {
-      get { return _name; }
-      set 
+      get
+      {
+        return _name;
+      }
+      set
       {
         const string usageError = "{0}: \'Name\' property is obsolete. Instead use \'TargetProperties\'. (XAML example: <t:PropertyDefinition TargetProperties=\"FirstName,LastName\" />)";
         System.Diagnostics.Trace.TraceWarning( usageError, typeof( PropertyDefinition ) );
-        _name = value; 
+        _name = value;
       }
     }
 
     public string Category
     {
-      get { return _category; }
-      set 
+      get
+      {
+        return _category;
+      }
+      set
       {
         this.ThrowIfLocked( () => this.Category );
-        _category = value; 
+        _category = value;
       }
     }
 
     public string DisplayName
     {
-      get { return _displayName; }
+      get
+      {
+        return _displayName;
+      }
       set
       {
         this.ThrowIfLocked( () => this.DisplayName );
@@ -63,7 +72,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public string Description
     {
-      get { return _description; }
+      get
+      {
+        return _description;
+      }
       set
       {
         this.ThrowIfLocked( () => this.Description );
@@ -73,7 +85,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public int? DisplayOrder
     {
-      get { return _displayOrder; }
+      get
+      {
+        return _displayOrder;
+      }
       set
       {
         this.ThrowIfLocked( () => this.DisplayOrder );
@@ -83,7 +98,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public bool? IsBrowsable
     {
-      get { return _isBrowsable; }
+      get
+      {
+        return _isBrowsable;
+      }
       set
       {
         this.ThrowIfLocked( () => this.IsBrowsable );
@@ -93,7 +111,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public bool? IsExpandable
     {
-      get { return _isExpandable; }
+      get
+      {
+        return _isExpandable;
+      }
       set
       {
         this.ThrowIfLocked( () => this.IsExpandable );
@@ -109,7 +130,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       {
         throw new InvalidOperationException(
           string.Format(
-            @"{0}: When using 'TargetProperties' property, do not use 'Name' property.", 
+            @"{0}: When using 'TargetProperties' property, do not use 'Name' property.",
             typeof( PropertyDefinition ) ) );
       }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs
index 74d3aa43..ebff88d1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyDefinitionBaseCollection.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -19,7 +19,6 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
-using System.Windows.Documents;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
index 97983b14..57ca8a33 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGrid.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -98,7 +98,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     {
       get
       {
-        return (DataTemplate)GetValue( CategoryGroupHeaderTemplateProperty );
+        return ( DataTemplate )GetValue( CategoryGroupHeaderTemplateProperty );
       }
       set
       {
@@ -409,7 +409,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     {
       get
       {
-        return (double)GetValue( PropertyNameLeftPaddingProperty );
+        return ( double )GetValue( PropertyNameLeftPaddingProperty );
       }
       set
       {
@@ -442,7 +442,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     {
       get
       {
-        return (_containerHelper != null) ? _containerHelper.Properties : null;
+        return ( _containerHelper != null ) ? _containerHelper.Properties : null;
       }
     }
 
@@ -468,8 +468,14 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     /// </summary>
     public Style PropertyContainerStyle
     {
-      get { return ( Style )GetValue( PropertyContainerStyleProperty ); }
-      set { SetValue( PropertyContainerStyleProperty, value ); }
+      get
+      {
+        return ( Style )GetValue( PropertyContainerStyleProperty );
+      }
+      set
+      {
+        SetValue( PropertyContainerStyleProperty, value );
+      }
     }
 
     private static void OnPropertyContainerStyleChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
@@ -494,7 +500,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     {
       get
       {
-        return (PropertyDefinitionCollection)GetValue( PropertyDefinitionsProperty );
+        return ( PropertyDefinitionCollection )GetValue( PropertyDefinitionsProperty );
       }
       set
       {
@@ -506,7 +512,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     {
       var owner = o as PropertyGrid;
       if( owner != null )
-        owner.OnPropertyDefinitionsChanged( (PropertyDefinitionCollection)e.OldValue, (PropertyDefinitionCollection)e.NewValue );
+        owner.OnPropertyDefinitionsChanged( ( PropertyDefinitionCollection )e.OldValue, ( PropertyDefinitionCollection )e.NewValue );
     }
 
     protected virtual void OnPropertyDefinitionsChanged( PropertyDefinitionCollection oldValue, PropertyDefinitionCollection newValue )
@@ -557,7 +563,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     {
       var propertyGrid = o as PropertyGrid;
       if( propertyGrid != null )
-        propertyGrid.OnIsReadOnlyChanged( (bool)e.OldValue, (bool)e.NewValue );
+        propertyGrid.OnIsReadOnlyChanged( ( bool )e.OldValue, ( bool )e.NewValue );
     }
 
     protected virtual void OnIsReadOnlyChanged( bool oldValue, bool newValue )
@@ -670,7 +676,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       PropertyGrid propertyGrid = o as PropertyGrid;
       if( propertyGrid != null )
       {
-        if( (propertyGrid.SelectedObject is FrameworkElement) && ( String.IsNullOrEmpty( ( String )baseValue ) ))
+        if( ( propertyGrid.SelectedObject is FrameworkElement ) && ( String.IsNullOrEmpty( ( String )baseValue ) ) )
           return "<no name>";
       }
 
@@ -733,7 +739,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       if( newValue != null )
         newValue.IsSelected = true;
 
-      this.SelectedProperty = ( (newValue != null) && (_containerHelper != null) ) ? _containerHelper.ItemFromContainer( newValue ) : null;
+      this.SelectedProperty = ( ( newValue != null ) && ( _containerHelper != null ) ) ? _containerHelper.ItemFromContainer( newValue ) : null;
 
       RaiseEvent( new RoutedPropertyChangedEventArgs<PropertyItemBase>( oldValue, newValue, PropertyGrid.SelectedPropertyItemChangedEvent ) );
     }
@@ -753,8 +759,14 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     /// </summary>
     public object SelectedProperty
     {
-      get { return ( object )GetValue( SelectedPropertyProperty ); }
-      set { SetValue( SelectedPropertyProperty, value ); }
+      get
+      {
+        return ( object )GetValue( SelectedPropertyProperty );
+      }
+      set
+      {
+        SetValue( SelectedPropertyProperty, value );
+      }
     }
 
     private static void OnSelectedPropertyChanged( DependencyObject sender, DependencyPropertyChangedEventArgs args )
@@ -914,7 +926,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     public PropertyGrid()
     {
       _propertyDefinitionsListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( this.OnPropertyDefinitionsCollectionChanged );
-      _editorDefinitionsListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( this.OnEditorDefinitionsCollectionChanged);     
+      _editorDefinitionsListener = new WeakEventListener<NotifyCollectionChangedEventArgs>( this.OnEditorDefinitionsCollectionChanged );
       UpdateContainerHelper();
 #if VS2008
         EditorDefinitions = new EditorDefinitionCollection();
@@ -922,7 +934,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       this.SetCurrentValue( PropertyGrid.EditorDefinitionsProperty, new EditorDefinitionCollection() );
 #endif
 
-      PropertyDefinitions = new PropertyDefinitionCollection();      
+      PropertyDefinitions = new PropertyDefinitionCollection();
       this.PropertyValueChanged += this.PropertyGrid_PropertyValueChanged;
 
       AddHandler( PropertyItemBase.ItemSelectionChangedEvent, new RoutedEventHandler( OnItemSelectionChanged ) );
@@ -972,10 +984,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       var textBox = e.OriginalSource as TextBox;
 
       //hitting enter on textbox will update value of underlying source if UpdateTextBoxSourceOnEnterKey is true
-      if( (this.SelectedPropertyItem != null) 
-          && (e.Key == Key.Enter)
+      if( ( this.SelectedPropertyItem != null )
+          && ( e.Key == Key.Enter )
           && this.UpdateTextBoxSourceOnEnterKey
-          && (textBox != null)
+          && ( textBox != null )
           && !textBox.AcceptsReturn )
       {
         BindingExpression be = textBox.GetBindingExpression( TextBox.TextProperty );
@@ -997,7 +1009,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     }
 
 
-#endregion //Base Class Overrides
+    #endregion //Base Class Overrides
 
     #region Event Handlers
 
@@ -1103,6 +1115,9 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
 
 
+
+
+
 
 
 
@@ -1178,7 +1193,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     private ScrollViewer GetScrollViewer()
     {
-      if( (_containerHelper != null) && (_containerHelper.ChildrenItemsControl != null) )
+      if( ( _containerHelper != null ) && ( _containerHelper.ChildrenItemsControl != null ) )
       {
         return TreeHelper.FindChild<ScrollViewer>( _containerHelper.ChildrenItemsControl );
       }
@@ -1250,10 +1265,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     {
       if( _dragThumb != null )
       {
-      if( IsCategorized )
-        _dragThumb.Margin = new Thickness( 6, 0, 0, 0 );
-      else
-        _dragThumb.Margin = new Thickness( -1, 0, 0, 0 );
+        if( IsCategorized )
+          _dragThumb.Margin = new Thickness( 6, 0, 0, 0 );
+        else
+          _dragThumb.Margin = new Thickness( -1, 0, 0, 0 );
       }
     }
 
@@ -1369,6 +1384,12 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
 
 
+
+
+
+
+
+
     #region PreparePropertyItemEvent Attached Routed Event
 
     /// <summary>
@@ -1525,11 +1546,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     FilterInfo IPropertyContainer.FilterInfo
     {
-      get 
+      get
       {
         return new FilterInfo()
         {
-          Predicate = this.CreateFilter(this.Filter),
+          Predicate = this.CreateFilter( this.Filter ),
           InputString = this.Filter
         };
       }
@@ -1709,4 +1730,6 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
 
 
+
+
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridContextMenu.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridContextMenu.cs
index 787c1af0..c58be5c1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridContextMenu.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridContextMenu.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
index cb4de631..bfe4c878 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyGridUtilities.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -19,21 +19,14 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
+using System.IO;
 using System.Linq;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Media;
-using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
-using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
-using System.Linq.Expressions;
-using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Windows.Controls;
-using System.Reflection;
-using System.Windows.Controls.Primitives;
-using Xceed.Wpf.Toolkit.PropertyGrid.Converters;
-using Xceed.Wpf.Toolkit.Primitives;
-using System.IO;
+using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
@@ -52,16 +45,16 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       ITypeEditor editor = null;
 
       var context = new EditorTypeDescriptorContext( null, propertyItem.Instance, propertyItem.PropertyDescriptor );
-      if( (typeConverter != null)
+      if( ( typeConverter != null )
         && typeConverter.GetStandardValuesSupported( context )
         && typeConverter.GetStandardValuesExclusive( context )
         && !( typeConverter is ReferenceConverter )  
-        && (propertyType != typeof( bool )) && (propertyType != typeof( bool? )) )  //Bool type always have a BooleanConverter with standardValues : True/False.
+        && ( propertyType != typeof( bool ) ) && ( propertyType != typeof( bool? ) ) )  //Bool type always have a BooleanConverter with standardValues : True/False.
       {
         var items = typeConverter.GetStandardValues( context );
         editor = new SourceComboBoxEditor( items, typeConverter );
       }
-      else if( propertyType == typeof( string )  )
+      else if( propertyType == typeof( string ) )
         editor = new TextBoxEditor();
       else if( propertyType == typeof( bool ) || propertyType == typeof( bool? ) )
         editor = new CheckBoxEditor();
@@ -97,9 +90,9 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
         editor = new TimeSpanUpDownEditor();
       else if( propertyType == typeof( FontFamily ) || propertyType == typeof( FontWeight ) || propertyType == typeof( FontStyle ) || propertyType == typeof( FontStretch ) )
         editor = new FontComboBoxEditor();
-      else if (propertyType == typeof(Guid) || propertyType == typeof(Guid?))
+      else if( propertyType == typeof( Guid ) || propertyType == typeof( Guid? ) )
         editor = new MaskedTextBoxEditor() { ValueDataType = propertyType, Mask = "AAAAAAAA-AAAA-AAAA-AAAA-AAAAAAAAAAAA" };
-      else if (propertyType == typeof(char) || propertyType == typeof(char?))
+      else if( propertyType == typeof( char ) || propertyType == typeof( char? ) )
         editor = new MaskedTextBoxEditor() { ValueDataType = propertyType, Mask = "&" };
       else if( propertyType == typeof( object ) )
         // If any type of object is possible in the property, default to the TextBoxEditor.
@@ -123,7 +116,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
           var dictionaryType = ListUtilities.GetDictionaryItemsType( propertyType );
           var collectionType = ListUtilities.GetCollectionItemType( propertyType );
           // A dictionary of T or a Collection of T or an ICollection
-          if( (dictionaryType != null) || (collectionType != null) || typeof( ICollection ).IsAssignableFrom( propertyType ) )
+          if( ( dictionaryType != null ) || ( collectionType != null ) || typeof( ICollection ).IsAssignableFrom( propertyType ) )
           {
             editor = new Xceed.Wpf.Toolkit.PropertyGrid.Editors.CollectionEditor();
           }
@@ -132,9 +125,9 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
             // If the type is not supported, check if there is a converter that supports
             // string conversion to the object type. Use TextBox in theses cases.
             // Otherwise, return a TextBlock editor since no valid editor exists.
-            editor = (typeConverter != null && typeConverter.CanConvertFrom( typeof( string ) ))
-              ? (ITypeEditor)new TextBoxEditor()
-              : (ITypeEditor)new TextBlockEditor();
+            editor = ( typeConverter != null && typeConverter.CanConvertFrom( typeof( string ) ) )
+              ? ( ITypeEditor )new TextBoxEditor()
+              : ( ITypeEditor )new TextBlockEditor();
           }
         }
       }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
index 4db14eb5..e4d4f4f0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItem.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,20 +16,11 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Linq;
+using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
-using System.Windows.Media;
 using System.Windows.Data;
-using System.Collections;
-using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Linq.Expressions;
-using System.Diagnostics;
-using System.Globalization;
 using System.Windows.Threading;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
@@ -49,15 +40,21 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public bool IsReadOnly
     {
-      get { return ( bool )GetValue( IsReadOnlyProperty ); }
-      set { SetValue( IsReadOnlyProperty, value ); }
+      get
+      {
+        return ( bool )GetValue( IsReadOnlyProperty );
+      }
+      set
+      {
+        SetValue( IsReadOnlyProperty, value );
+      }
     }
 
     private static void OnIsReadOnlyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
     {
       var propertyItem = o as PropertyItem;
       if( propertyItem != null )
-        propertyItem.OnIsReadOnlyChanged( (bool)e.OldValue, (bool)e.NewValue );
+        propertyItem.OnIsReadOnlyChanged( ( bool )e.OldValue, ( bool )e.NewValue );
     }
 
     protected virtual void OnIsReadOnlyChanged( bool oldValue, bool newValue )
@@ -133,7 +130,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     {
       get
       {
-        return (this.DescriptorDefinition != null) ? this.DescriptorDefinition.PropertyName : null;
+        return ( this.DescriptorDefinition != null ) ? this.DescriptorDefinition.PropertyName : null;
       }
     }
 
@@ -173,6 +170,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #endregion //Instance
 
+
     #endregion //Properties
 
     #region Overrides
@@ -225,15 +223,15 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     internal void SetRedInvalidBorder( BindingExpression be )
     {
-      if( (be != null) && be.DataItem is DescriptorPropertyDefinitionBase )
+      if( ( be != null ) && be.DataItem is DescriptorPropertyDefinitionBase )
       {
         this.Dispatcher.BeginInvoke( DispatcherPriority.Input, new Action( () =>
         {
           DescriptorPropertyDefinitionBase descriptor = be.DataItem as DescriptorPropertyDefinitionBase;
-          if( ( descriptor != null) && Validation.GetHasError( descriptor ) )
+          if( ( descriptor != null ) && Validation.GetHasError( descriptor ) )
           {
-              var errors = Validation.GetErrors( descriptor );
-              Validation.MarkInvalid( be, errors[0] );
+            var errors = Validation.GetErrors( descriptor );
+            Validation.MarkInvalid( be, errors[ 0 ] );
           }
         } ) );
       }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
index f901b294..eae9f0e8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemBase.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -50,8 +50,14 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public ImageSource AdvancedOptionsIcon
     {
-      get { return ( ImageSource )GetValue( AdvancedOptionsIconProperty ); }
-      set { SetValue( AdvancedOptionsIconProperty, value ); }
+      get
+      {
+        return ( ImageSource )GetValue( AdvancedOptionsIconProperty );
+      }
+      set
+      {
+        SetValue( AdvancedOptionsIconProperty, value );
+      }
     }
 
     #endregion //AdvancedOptionsIcon
@@ -63,8 +69,14 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public object AdvancedOptionsTooltip
     {
-      get { return ( object )GetValue( AdvancedOptionsTooltipProperty ); }
-      set { SetValue( AdvancedOptionsTooltipProperty, value ); }
+      get
+      {
+        return ( object )GetValue( AdvancedOptionsTooltipProperty );
+      }
+      set
+      {
+        SetValue( AdvancedOptionsTooltipProperty, value );
+      }
     }
 
     #endregion //AdvancedOptionsTooltip
@@ -81,8 +93,14 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public string Description
     {
-      get { return ( string )GetValue( DescriptionProperty ); }
-      set { SetValue( DescriptionProperty, value ); }
+      get
+      {
+        return ( string )GetValue( DescriptionProperty );
+      }
+      set
+      {
+        SetValue( DescriptionProperty, value );
+      }
     }
 
     #endregion //Description
@@ -94,8 +112,14 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public string DisplayName
     {
-      get { return ( string )GetValue( DisplayNameProperty ); }
-      set { SetValue( DisplayNameProperty, value ); }
+      get
+      {
+        return ( string )GetValue( DisplayNameProperty );
+      }
+      set
+      {
+        SetValue( DisplayNameProperty, value );
+      }
     }
 
     #endregion //DisplayName
@@ -181,8 +205,14 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public bool IsExpandable
     {
-      get { return ( bool )GetValue( IsExpandableProperty ); }
-      set { SetValue( IsExpandableProperty, value ); }
+      get
+      {
+        return ( bool )GetValue( IsExpandableProperty );
+      }
+      set
+      {
+        SetValue( IsExpandableProperty, value );
+      }
     }
 
     #endregion //IsExpandable
@@ -224,7 +254,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     /// </summary>
     public FrameworkElement ParentElement
     {
-      get { return this.ParentNode as FrameworkElement; }
+      get
+      {
+        return this.ParentNode as FrameworkElement;
+      }
     }
     #endregion
 
@@ -286,7 +319,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
     /// Get the PropertyContainerStyle for sub items of this property.
     /// It return the value defined on PropertyGrid.PropertyContainerStyle.
     /// </summary>
-    public Style PropertyContainerStyle 
+    public Style PropertyContainerStyle
     {
       get
       {
@@ -379,6 +412,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     internal PropertyItemBase()
     {
+      this.DataContext = this;
       this.GotFocus += new RoutedEventHandler( PropertyItemBase_GotFocus );
       this.RequestBringIntoView += this.PropertyItemBase_RequestBringIntoView;
       AddHandler( PropertyItemsControl.PreparePropertyItemEvent, new PropertyItemEventHandler( OnPreparePropertyItemInternal ) );
@@ -447,7 +481,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
 
     private void PropertyItemBase_GotFocus( object sender, RoutedEventArgs e )
-    { 
+    {
       IsSelected = true;
       // Handle the event; otherwise, the possible 
       // parent property item will select itself too.
@@ -460,10 +494,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
       // First check that the raised property is actually a real CLR property.
       // This could be something else like an Attached DP.
-      if( ReflectionHelper.IsPublicInstanceProperty( GetType(), e.Property.Name ) 
-        && this.IsLoaded 
-        && (_parentNode != null) 
-        && !_parentNode.ContainerHelper.IsCleaning)
+      if( ReflectionHelper.IsPublicInstanceProperty( GetType(), e.Property.Name )
+        && this.IsLoaded
+        && ( _parentNode != null )
+        && !_parentNode.ContainerHelper.IsCleaning )
       {
         this.RaisePropertyChanged( e.Property.Name );
       }
@@ -471,7 +505,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     private PropertyDefinitionCollection GetPropertItemPropertyDefinitions()
     {
-      if( (this.ParentNode != null) && (this.ParentNode.PropertyDefinitions != null) )
+      if( ( this.ParentNode != null ) && ( this.ParentNode.PropertyDefinitions != null ) )
       {
         var name = this.GetPropertyItemName();
         foreach( var pd in this.ParentNode.PropertyDefinitions )
@@ -490,7 +524,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
               {
                 var targetPropertyType = targetProperty as Type;
                 // PropertyDefinitions contains a PropertyDefinition for this PropertyItem Type => return its PropertyDefinitions.
-                if( (targetPropertyType != null) && targetPropertyType.IsAssignableFrom( type ) )
+                if( ( targetPropertyType != null ) && targetPropertyType.IsAssignableFrom( type ) )
                   return pd.PropertyDefinitions;
               }
             }
@@ -511,14 +545,17 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     Style IPropertyContainer.PropertyContainerStyle
     {
-      get { return this.PropertyContainerStyle; }
+      get
+      {
+        return this.PropertyContainerStyle;
+      }
     }
 
     EditorDefinitionCollection IPropertyContainer.EditorDefinitions
     {
       get
       {
-        return (this.ParentNode != null) ? this.ParentNode.EditorDefinitions : null;
+        return ( this.ParentNode != null ) ? this.ParentNode.EditorDefinitions : null;
       }
     }
 
@@ -530,7 +567,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       }
     }
 
-    ContainerHelperBase IPropertyContainer.ContainerHelper 
+    ContainerHelperBase IPropertyContainer.ContainerHelper
     {
       get
       {
@@ -538,7 +575,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       }
     }
 
-    bool IPropertyContainer.IsCategorized 
+    bool IPropertyContainer.IsCategorized
     {
       get
       {
@@ -562,7 +599,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
         {
           var propertyItemPropertyDefinitions = this.GetPropertItemPropertyDefinitions();
           // No PropertyDefinitions specified : show all properties of this PropertyItem.
-          if( (propertyItemPropertyDefinitions == null) || (propertyItemPropertyDefinitions.Count == 0) )
+          if( ( propertyItemPropertyDefinitions == null ) || ( propertyItemPropertyDefinitions.Count == 0 ) )
             return true;
 
           // A PropertyDefinitions is specified : show only the properties of the PropertyDefinitions from this PropertyItem.
@@ -582,7 +619,10 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     FilterInfo IPropertyContainer.FilterInfo
     {
-      get { return new FilterInfo(); }
+      get
+      {
+        return new FilterInfo();
+      }
     }
 
     bool? IPropertyContainer.IsPropertyVisible( PropertyDescriptor pd )
@@ -597,7 +637,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
 
 
-#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 3b8028d8..a2e474de 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemCollection.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -21,7 +21,6 @@ using System.ComponentModel;
 using System.Windows.Data;
 using System;
 using System.Collections.Specialized;
-using System.Diagnostics;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 using System.Linq;
 using System.Collections;
@@ -51,19 +50,28 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       DisplayNamePropertyName = ReflectionHelper.GetPropertyOrFieldName( () => p.DisplayName );
     }
 
-    public PropertyItemCollection(ObservableCollection<PropertyItem> editableCollection)
-      :base(editableCollection)
+    public PropertyItemCollection( ObservableCollection<PropertyItem> editableCollection )
+      : base( editableCollection )
     {
       EditableCollection = editableCollection;
     }
 
     internal Predicate<object> FilterPredicate
     {
-      get { return GetDefaultView().Filter; }
-      set { GetDefaultView().Filter = value; }
+      get
+      {
+        return GetDefaultView().Filter;
+      }
+      set
+      {
+        GetDefaultView().Filter = value;
+      }
     }
 
-    public ObservableCollection<PropertyItem> EditableCollection { get; private set; }
+    public ObservableCollection<PropertyItem> EditableCollection
+    {
+      get; private set;
+    }
 
     private ICollectionView GetDefaultView()
     {
@@ -175,7 +183,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
             }
 #endif
             property.HighlightedText = property.DisplayName.ToLower().Contains( text.ToLower() ) ? text : null;
-            return (property.HighlightedText != null);
+            return ( property.HighlightedText != null );
           }
 
           return false;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
index ab09c1c3..7f69b0a7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/PropertyItemsControl.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs
index ed931e0f..0972553f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/StringConstants.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -15,43 +15,56 @@
 
   ***********************************************************************************/
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
   public static class StringConstants
   {
     public static string Local
     {
-      get { return "Local"; }
+      get
+      {
+        return "Local";
+      }
     }
 
     public static string Resource
     {
-      get { return "Resource"; }
+      get
+      {
+        return "Resource";
+      }
     }
 
     public static string Databinding
     {
-      get { return "Databinding"; }
+      get
+      {
+        return "Databinding";
+      }
     }
 
     public static string Inheritance
     {
-      get { return "Inheritance"; }
+      get
+      {
+        return "Inheritance";
+      }
     }
 
     public static string StyleSetter
     {
-      get { return "Style Setter"; }
+      get
+      {
+        return "Style Setter";
+      }
     }
 
     public static string Default
     {
-      get { return "Default"; }
+      get
+      {
+        return "Default";
+      }
     }
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs
index 25f3aa30..0a18c893 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TargetPropertyType.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,10 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit.PropertyGrid
 {
@@ -35,8 +31,11 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     public Type Type
     {
-      get { return _type; }
-      set 
+      get
+      {
+        return _type;
+      }
+      set
       {
         if( _sealed )
           throw new InvalidOperationException(
@@ -44,7 +43,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
             "{0}.Type property cannot be modified once the instance is used",
             typeof( TargetPropertyType ) ) );
 
-        _type = value; 
+        _type = value;
       }
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
index abf15d31..e2f1584c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Implementation/TrimmedTextBlock.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,9 +16,6 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
@@ -63,7 +60,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     private void OnIsTextTrimmedChanged( bool oldValue, bool newValue )
     {
-        this.ToolTip = ( newValue ) ? this.Text : null;
+      this.ToolTip = ( newValue ) ? this.Text : null;
     }
 
     #endregion
@@ -120,7 +117,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
       if( newValue == null )
       {
         var newrRun = new Run( this.Text );
-        this.Inlines.Clear();        
+        this.Inlines.Clear();
         this.Inlines.Add( newrRun );
 
         return;
@@ -153,7 +150,7 @@ namespace Xceed.Wpf.Toolkit.PropertyGrid
 
     #region Event Handler
 
-    private void TrimmedTextBlock_SizeChanged(object sender, SizeChangedEventArgs e)
+    private void TrimmedTextBlock_SizeChanged( object sender, SizeChangedEventArgs e )
     {
       var textBlock = sender as TextBlock;
       if( textBlock != null )
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 312dfe98..4e3681cf 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
index 2ccd4430..889b796a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/PropertyGrid/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs
index c95bcb67..d9d4fcaa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/Converters/SliderThumbWidthConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,17 +16,13 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.Linq;
-using System.Text;
 using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
 using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.Converters
 {
-  [Obsolete("This class is no longer used internaly and may be removed in a future release")]
+  [Obsolete( "This class is no longer used internaly and may be removed in a future release" )]
   public class SliderThumbWidthConverter : IValueConverter
   {
     public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
index ec7b3300..5f74c9cc 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Implementation/RangeSlider.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -75,7 +75,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (AutoToolTipPlacement)GetValue( RangeSlider.AutoToolTipPlacementProperty );
+        return ( AutoToolTipPlacement )GetValue( RangeSlider.AutoToolTipPlacementProperty );
       }
       set
       {
@@ -88,7 +88,7 @@ namespace Xceed.Wpf.Toolkit
       var rangeSlider = sender as RangeSlider;
       if( rangeSlider != null )
       {
-        rangeSlider.OnAutoToolTipPlacementChanged( (AutoToolTipPlacement)e.OldValue, (AutoToolTipPlacement)e.NewValue );
+        rangeSlider.OnAutoToolTipPlacementChanged( ( AutoToolTipPlacement )e.OldValue, ( AutoToolTipPlacement )e.NewValue );
       }
     }
 
@@ -107,7 +107,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (int)GetValue( RangeSlider.AutoToolTipPrecisionProperty );
+        return ( int )GetValue( RangeSlider.AutoToolTipPrecisionProperty );
       }
       set
       {
@@ -129,7 +129,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Brush)GetValue( RangeSlider.HigherRangeBackgroundProperty );
+        return ( Brush )GetValue( RangeSlider.HigherRangeBackgroundProperty );
       }
       set
       {
@@ -151,7 +151,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Style)this.GetValue( RangeSlider.HigherRangeStyleProperty );
+        return ( Style )this.GetValue( RangeSlider.HigherRangeStyleProperty );
       }
       set
       {
@@ -176,7 +176,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (double)GetValue( RangeSlider.HigherRangeWidthProperty );
+        return ( double )GetValue( RangeSlider.HigherRangeWidthProperty );
       }
       private set
       {
@@ -198,7 +198,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Brush)GetValue( RangeSlider.HigherThumbBackgroundProperty );
+        return ( Brush )GetValue( RangeSlider.HigherThumbBackgroundProperty );
       }
       set
       {
@@ -219,7 +219,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (double)GetValue( RangeSlider.HigherValueProperty );
+        return ( double )GetValue( RangeSlider.HigherValueProperty );
       }
       set
       {
@@ -229,14 +229,14 @@ namespace Xceed.Wpf.Toolkit
 
     private static object OnCoerceHigherValueChanged( DependencyObject d, object basevalue )
     {
-      var rangeSlider = (RangeSlider)d;
-      if( (rangeSlider == null) || !rangeSlider.IsLoaded)
+      var rangeSlider = ( RangeSlider )d;
+      if( ( rangeSlider == null ) || !rangeSlider.IsLoaded )
         return basevalue;
 
       var min = Math.Min( rangeSlider.Minimum, rangeSlider.Maximum );
       var max = Math.Max( rangeSlider.Minimum, rangeSlider.Maximum );
-      var higherValue = Math.Max( rangeSlider.Minimum, Math.Min( rangeSlider.Maximum, (double)basevalue ) );
-      higherValue = Math.Max( rangeSlider.LowerValue, ( double)basevalue );
+      var higherValue = Math.Max( rangeSlider.Minimum, Math.Min( rangeSlider.Maximum, ( double )basevalue ) );
+      higherValue = Math.Max( rangeSlider.LowerValue, ( double )basevalue );
 
       return higherValue;
     }
@@ -246,7 +246,7 @@ namespace Xceed.Wpf.Toolkit
       RangeSlider rangeSlider = sender as RangeSlider;
       if( rangeSlider != null )
       {
-        rangeSlider.OnHigherValueChanged( (double)args.OldValue, (double)args.NewValue );
+        rangeSlider.OnHigherValueChanged( ( double )args.OldValue, ( double )args.NewValue );
       }
     }
 
@@ -272,7 +272,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (bool)GetValue( RangeSlider.IsDeferredUpdateValuesProperty );
+        return ( bool )GetValue( RangeSlider.IsDeferredUpdateValuesProperty );
       }
       set
       {
@@ -291,7 +291,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (bool)GetValue( RangeSlider.IsSnapToTickEnabledProperty );
+        return ( bool )GetValue( RangeSlider.IsSnapToTickEnabledProperty );
       }
       set
       {
@@ -313,7 +313,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Brush)GetValue( RangeSlider.LowerRangeBackgroundProperty );
+        return ( Brush )GetValue( RangeSlider.LowerRangeBackgroundProperty );
       }
       set
       {
@@ -335,7 +335,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Style)this.GetValue( RangeSlider.LowerRangeStyleProperty );
+        return ( Style )this.GetValue( RangeSlider.LowerRangeStyleProperty );
       }
       set
       {
@@ -360,7 +360,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (double)GetValue( RangeSlider.LowerRangeWidthProperty );
+        return ( double )GetValue( RangeSlider.LowerRangeWidthProperty );
       }
       private set
       {
@@ -381,7 +381,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Brush)GetValue( RangeSlider.LowerThumbBackgroundProperty );
+        return ( Brush )GetValue( RangeSlider.LowerThumbBackgroundProperty );
       }
       set
       {
@@ -402,7 +402,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (double)GetValue( RangeSlider.LowerValueProperty );
+        return ( double )GetValue( RangeSlider.LowerValueProperty );
       }
       set
       {
@@ -412,14 +412,14 @@ namespace Xceed.Wpf.Toolkit
 
     private static object OnCoerceLowerValueChanged( DependencyObject d, object basevalue )
     {
-      var rangeSlider = (RangeSlider)d;
-      if( (rangeSlider == null) || !rangeSlider.IsLoaded )
+      var rangeSlider = ( RangeSlider )d;
+      if( ( rangeSlider == null ) || !rangeSlider.IsLoaded )
         return basevalue;
 
       var min = Math.Min( rangeSlider.Minimum, rangeSlider.Maximum );
       var max = Math.Max( rangeSlider.Minimum, rangeSlider.Maximum );
-      var lowerValue = Math.Max( rangeSlider.Minimum, Math.Min( rangeSlider.Maximum, (double)basevalue ) );
-      lowerValue = Math.Min( (double)basevalue, rangeSlider.HigherValue );
+      var lowerValue = Math.Max( rangeSlider.Minimum, Math.Min( rangeSlider.Maximum, ( double )basevalue ) );
+      lowerValue = Math.Min( ( double )basevalue, rangeSlider.HigherValue );
 
       return lowerValue;
     }
@@ -429,7 +429,7 @@ namespace Xceed.Wpf.Toolkit
       RangeSlider rangeSlider = sender as RangeSlider;
       if( rangeSlider != null )
       {
-        rangeSlider.OnLowerValueChanged( (double)args.OldValue, (double)args.NewValue );
+        rangeSlider.OnLowerValueChanged( ( double )args.OldValue, ( double )args.NewValue );
       }
     }
 
@@ -455,7 +455,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (double)GetValue( RangeSlider.MaximumProperty );
+        return ( double )GetValue( RangeSlider.MaximumProperty );
       }
       set
       {
@@ -468,7 +468,7 @@ namespace Xceed.Wpf.Toolkit
       RangeSlider rangeSlider = sender as RangeSlider;
       if( rangeSlider != null )
       {
-        rangeSlider.OnMaximumChanged( (double)args.OldValue, (double)args.NewValue );
+        rangeSlider.OnMaximumChanged( ( double )args.OldValue, ( double )args.NewValue );
       }
     }
 
@@ -490,7 +490,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (double)GetValue( RangeSlider.MinimumProperty );
+        return ( double )GetValue( RangeSlider.MinimumProperty );
       }
       set
       {
@@ -503,7 +503,7 @@ namespace Xceed.Wpf.Toolkit
       RangeSlider rangeSlider = sender as RangeSlider;
       if( rangeSlider != null )
       {
-        rangeSlider.OnMinimumChanged( (double)args.OldValue, (double)args.NewValue );
+        rangeSlider.OnMinimumChanged( ( double )args.OldValue, ( double )args.NewValue );
       }
     }
 
@@ -527,7 +527,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Orientation)GetValue( RangeSlider.OrientationProperty );
+        return ( Orientation )GetValue( RangeSlider.OrientationProperty );
       }
       set
       {
@@ -540,7 +540,7 @@ namespace Xceed.Wpf.Toolkit
       RangeSlider rangeSlider = sender as RangeSlider;
       if( rangeSlider != null )
       {
-        rangeSlider.OnOrientationChanged( (Orientation)e.OldValue, (Orientation)e.NewValue );
+        rangeSlider.OnOrientationChanged( ( Orientation )e.OldValue, ( Orientation )e.NewValue );
       }
     }
 
@@ -562,7 +562,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Brush)GetValue( RangeSlider.RangeBackgroundProperty );
+        return ( Brush )GetValue( RangeSlider.RangeBackgroundProperty );
       }
       set
       {
@@ -584,7 +584,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (Style)this.GetValue( RangeSlider.RangeStyleProperty );
+        return ( Style )this.GetValue( RangeSlider.RangeStyleProperty );
       }
       set
       {
@@ -608,7 +608,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (double)GetValue( RangeSlider.RangeWidthProperty );
+        return ( double )GetValue( RangeSlider.RangeWidthProperty );
       }
       private set
       {
@@ -629,7 +629,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (double)GetValue( RangeSlider.StepProperty );
+        return ( double )GetValue( RangeSlider.StepProperty );
       }
       set
       {
@@ -640,7 +640,7 @@ namespace Xceed.Wpf.Toolkit
     private static object CoerceStep( DependencyObject sender, object value )
     {
       RangeSlider rangeSlider = sender as RangeSlider;
-      double newValue = (double)value;
+      double newValue = ( double )value;
 
       return Math.Max( 0.01, newValue );
     }
@@ -658,7 +658,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (double)GetValue( RangeSlider.TickFrequencyProperty );
+        return ( double )GetValue( RangeSlider.TickFrequencyProperty );
       }
       set
       {
@@ -671,7 +671,7 @@ namespace Xceed.Wpf.Toolkit
       var rangeSlider = sender as RangeSlider;
       if( rangeSlider != null )
       {
-        rangeSlider.OnTickFrequencyChanged( (double)args.OldValue, (double)args.NewValue );
+        rangeSlider.OnTickFrequencyChanged( ( double )args.OldValue, ( double )args.NewValue );
       }
     }
 
@@ -690,7 +690,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (TickPlacement)GetValue( RangeSlider.TickPlacementProperty );
+        return ( TickPlacement )GetValue( RangeSlider.TickPlacementProperty );
       }
       set
       {
@@ -703,7 +703,7 @@ namespace Xceed.Wpf.Toolkit
       var rangeSlider = sender as RangeSlider;
       if( rangeSlider != null )
       {
-        rangeSlider.OnTickPlacementChanged( (TickPlacement)e.OldValue, (TickPlacement)e.NewValue );
+        rangeSlider.OnTickPlacementChanged( ( TickPlacement )e.OldValue, ( TickPlacement )e.NewValue );
       }
     }
 
@@ -800,7 +800,7 @@ namespace Xceed.Wpf.Toolkit
     {
       if( slider != null )
       {
-        var track = (Track)slider.Template.FindName( "PART_Track", slider );
+        var track = ( Track )slider.Template.FindName( "PART_Track", slider );
         if( track != null )
         {
           var thumb = track.Thumb;
@@ -814,7 +814,7 @@ namespace Xceed.Wpf.Toolkit
     {
       if( slider != null )
       {
-        var track = (Track)slider.Template.FindName( "PART_Track", slider );
+        var track = ( Track )slider.Template.FindName( "PART_Track", slider );
         if( track != null )
         {
           var thumb = track.Thumb;
@@ -846,7 +846,7 @@ namespace Xceed.Wpf.Toolkit
         higherSliderThumbWidth = RangeSlider.GetThumbHeight( _higherSlider );
       }
 
-      actualWidth -= (lowerSliderThumbWidth + higherSliderThumbWidth);
+      actualWidth -= ( lowerSliderThumbWidth + higherSliderThumbWidth );
 
       if( !this.IsDeferredUpdateValues || ( _deferredUpdateValue == null ) )
       {
@@ -858,14 +858,14 @@ namespace Xceed.Wpf.Toolkit
 
       if( entireRange > 0 )
       {
-        var higherValue = this.IsDeferredUpdateValues && isHigherValueChanged && (_deferredUpdateValue != null ) ? _deferredUpdateValue.Value : cv.HigherValue;
+        var higherValue = this.IsDeferredUpdateValues && isHigherValueChanged && ( _deferredUpdateValue != null ) ? _deferredUpdateValue.Value : cv.HigherValue;
         var lowerValue = this.IsDeferredUpdateValues && !isHigherValueChanged && ( _deferredUpdateValue != null ) ? _deferredUpdateValue.Value : cv.LowerValue;
 
-        this.HigherRangeWidth = (actualWidth * (cv.Maximum - higherValue ) ) / entireRange;
+        this.HigherRangeWidth = ( actualWidth * ( cv.Maximum - higherValue ) ) / entireRange;
 
-        this.RangeWidth = (actualWidth * ( higherValue - lowerValue ) ) / entireRange;
+        this.RangeWidth = ( actualWidth * ( higherValue - lowerValue ) ) / entireRange;
 
-        this.LowerRangeWidth = (actualWidth * ( lowerValue - cv.Minimum)) / entireRange;
+        this.LowerRangeWidth = ( actualWidth * ( lowerValue - cv.Minimum ) ) / entireRange;
       }
       else
       {
@@ -877,7 +877,7 @@ namespace Xceed.Wpf.Toolkit
 
     private void SetSlidersMargins()
     {
-      if( (_lowerSlider != null) && (_higherSlider != null) )
+      if( ( _lowerSlider != null ) && ( _higherSlider != null ) )
       {
         if( this.Orientation == Orientation.Horizontal )
         {
@@ -1036,7 +1036,7 @@ namespace Xceed.Wpf.Toolkit
 
     private void LowerSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs<double> e )
     {
-      if( (_lowerSlider != null) && _lowerSlider.IsLoaded )
+      if( ( _lowerSlider != null ) && _lowerSlider.IsLoaded )
       {
         if( !this.IsDeferredUpdateValues )
         {
@@ -1052,7 +1052,7 @@ namespace Xceed.Wpf.Toolkit
 
     private void HigherSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs<double> e )
     {
-      if( ( _higherSlider != null) && _higherSlider.IsLoaded )
+      if( ( _higherSlider != null ) && _higherSlider.IsLoaded )
       {
         if( !this.IsDeferredUpdateValues )
         {
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 56ab2246..11bb40aa 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
index e42b96f9..ac83246f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RangeSlider/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
index b39db062..d24b83cb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/ITextFormatter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
index f3a1e250..1c58498d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/PlainTextFormatter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
index 6991ce79..78c3fde5 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/RtfFormatter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
index b0e57528..86f21d0a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/Formatters/XamlFormatter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
index f5087c97..bbe61b13 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBox/RichTextBox.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -18,7 +18,6 @@
 using System;
 using System.Windows;
 using System.Windows.Data;
-using System.Windows.Threading;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -109,7 +108,7 @@ namespace Xceed.Wpf.Toolkit
     protected override void OnTextChanged( System.Windows.Controls.TextChangedEventArgs e )
     {
       this.UpdateTextFromDocument();
-      base.OnTextChanged( e );     
+      base.OnTextChanged( e );
     }
 
     private void UpdateTextFromDocument()
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
index 075cbb05..156cf1ef 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
index 9fe92689..f66048db 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBar.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -53,13 +53,13 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return new double[] { 
-		            3.0, 4.0, 5.0, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 
-		            10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0,
-		            16.0, 17.0, 18.0, 19.0, 20.0, 22.0, 24.0, 26.0, 28.0, 30.0,
-		            32.0, 34.0, 36.0, 38.0, 40.0, 44.0, 48.0, 52.0, 56.0, 60.0, 64.0, 68.0, 72.0, 76.0,
-		            80.0, 88.0, 96.0, 104.0, 112.0, 120.0, 128.0, 136.0, 144.0
-		            };
+        return new double[] {
+                3.0, 4.0, 5.0, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5,
+                10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0,
+                16.0, 17.0, 18.0, 19.0, 20.0, 22.0, 24.0, 26.0, 28.0, 30.0,
+                32.0, 34.0, 36.0, 38.0, 40.0, 44.0, 48.0, 52.0, 56.0, 60.0, 64.0, 68.0, 72.0, 76.0,
+                80.0, 88.0, 96.0, 104.0, 112.0, 120.0, 128.0, 136.0, 144.0
+                };
       }
     }
 
@@ -122,7 +122,7 @@ namespace Xceed.Wpf.Toolkit
 
     private void Bullets_Clicked( object sender, RoutedEventArgs e )
     {
-      if( BothSelectionListsAreChecked() && ( _btnNumbers != null) )
+      if( BothSelectionListsAreChecked() && ( _btnNumbers != null ) )
       {
         _btnNumbers.IsChecked = false;
       }
@@ -130,7 +130,7 @@ namespace Xceed.Wpf.Toolkit
 
     private void Numbers_Clicked( object sender, RoutedEventArgs e )
     {
-      if( BothSelectionListsAreChecked() && ( _btnBullets != null) )
+      if( BothSelectionListsAreChecked() && ( _btnBullets != null ) )
       {
         _btnBullets.IsChecked = false;
       }
@@ -294,7 +294,7 @@ namespace Xceed.Wpf.Toolkit
         return;
 
       FontFamily currentFontFamily = ( FontFamily )value;
-      if( (currentFontFamily != null) && ( _cmbFontFamilies != null) )
+      if( ( currentFontFamily != null ) && ( _cmbFontFamilies != null ) )
       {
         _cmbFontFamilies.SelectedItem = FontUtilities.GetFontFamilyName( currentFontFamily );
       }
@@ -328,7 +328,7 @@ namespace Xceed.Wpf.Toolkit
       if( value == DependencyProperty.UnsetValue )
         return;
 
-      Color? currentColor =  ( ( value == null )
+      Color? currentColor = ( ( value == null )
                               ? null
                               : ( Color? )( ( SolidColorBrush )value ).Color );
       if( _cmbFontColor != null )
@@ -362,7 +362,7 @@ namespace Xceed.Wpf.Toolkit
     /// </summary>
     private void UpdateSelectionListType()
     {
-      if( (_btnNumbers == null) || ( _btnBullets == null) )
+      if( ( _btnNumbers == null ) || ( _btnBullets == null ) )
         return;
 
       //uncheck both
@@ -395,8 +395,8 @@ namespace Xceed.Wpf.Toolkit
     /// <returns></returns>
     private bool BothSelectionListsAreChecked()
     {
-      return (( _btnBullets != null) && (_btnBullets.IsChecked == true) )
-          && (( _btnNumbers != null) && (_btnNumbers.IsChecked == true));
+      return ( ( _btnBullets != null ) && ( _btnBullets.IsChecked == true ) )
+          && ( ( _btnNumbers != null ) && ( _btnNumbers.IsChecked == true ) );
     }
 
     void ApplyPropertyValueToSelectedText( DependencyProperty formattingProperty, object value )
@@ -452,10 +452,10 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return ( (( _cmbFontFamilies != null) && _cmbFontFamilies.IsDropDownOpen)
-              || (( _cmbFontSizes != null) && _cmbFontSizes.IsDropDownOpen)
-              ||  (( _cmbFontBackgroundColor != null) && _cmbFontBackgroundColor.IsOpen)
-              || (( _cmbFontColor != null) && _cmbFontColor.IsOpen)
+        return ( ( ( _cmbFontFamilies != null ) && _cmbFontFamilies.IsDropDownOpen )
+              || ( ( _cmbFontSizes != null ) && _cmbFontSizes.IsDropDownOpen )
+              || ( ( _cmbFontBackgroundColor != null ) && _cmbFontBackgroundColor.IsOpen )
+              || ( ( _cmbFontColor != null ) && _cmbFontColor.IsOpen )
               || _waitingForMouseOver );
       }
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
index 1261b073..42c02cd7 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 870c9322..57301457 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
index 4d4bbdfb..46970756 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/RichTextBoxFormatBar/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
index 76ab21ef..23006aff 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Implementation/SplitButton.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -76,6 +76,6 @@ namespace Xceed.Wpf.Toolkit
     }
 
 
-  #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 578208f6..b995a449 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
index 54a9c99e..9f4b47d9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/SplitButton/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs
index ef7cb29a..ebc59996 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/StyleableWindow/Implementation/Converters/StyleableWindowClippingBorderConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -16,12 +16,9 @@
   ***********************************************************************************/
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
 using System.Globalization;
 using System.Windows;
+using System.Windows.Data;
 
 namespace Xceed.Wpf.Toolkit.Converters
 {
@@ -29,8 +26,8 @@ namespace Xceed.Wpf.Toolkit.Converters
   {
     public object Convert( object value, Type targetType, object parameter, CultureInfo culture )
     {
-      double borderThickness = (double)value;
-      return new Thickness( borderThickness, borderThickness, borderThickness, borderThickness * 2);
+      double borderThickness = ( double )value;
+      return new Thickness( borderThickness, borderThickness, borderThickness, borderThickness * 2 );
     }
 
     public object ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
index f1708037..b4e4a93e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
index 5e2ce368..3c201357 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Brushes_NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
index 55c9d32a..7d778076 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero/Buttons_NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
index c6b1f1b7..83fe7d1c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml
index ad1c523f..1116f52a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Brushes.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
index dbffa789..7028a4e9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Buttons.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
index 61c8ca2e..669e07dd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Common.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
index 2f335574..e3ae0fa1 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Aero2/Glyphs.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
index f32dda2a..0972712e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
index 0a94f150..ce8604a8 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Brushes.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
index e4d11442..d29bf90c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Buttons.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
index 2186161d..c6f0fe4f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Common.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
index 08ce08b0..c9af5e4f 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/Generic/Glyphs.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
index 8ea86d7a..143fd9e0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/classic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
index 8ea86d7a..143fd9e0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.homestead.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
index 7bf52b17..001eb08d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.metallic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
index 8ea86d7a..143fd9e0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/luna.normalcolor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
index 8ea86d7a..143fd9e0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Themes/royale.normalcolor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
index 40ddf439..085dd1ad 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimeItem.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
index 4acbcd78..a9851f88 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Implementation/TimePicker.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,11 +17,11 @@
 
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using Xceed.Wpf.Toolkit.Core.Utilities;
-using System.Collections.Generic;
 using Xceed.Wpf.Toolkit.Primitives;
 
 namespace Xceed.Wpf.Toolkit
@@ -98,6 +98,48 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //Format
 
+    #region TimeListItemsStyle
+
+    /// <summary>
+    /// TimeListItemsStyle Dependency Property
+    /// </summary>
+    public static readonly DependencyProperty TimeListItemsStyleProperty = DependencyProperty.Register( "TimeListItemsStyle", typeof( Style ), typeof( TimePicker ),
+            new FrameworkPropertyMetadata( ( Style )null, new PropertyChangedCallback( OnTimeListItemsStyleChanged ) ) );
+
+    /// <summary>
+    /// Gets or sets the TimeListItemsStyle property.  
+    /// This dependency property indicates the style to apply to TimeListItems objects.
+    /// </summary>
+    public Style TimeListItemsStyle
+    {
+      get
+      {
+        return ( Style )GetValue( TimeListItemsStyleProperty );
+      }
+      set
+      {
+        SetValue( TimeListItemsStyleProperty, value );
+      }
+    }
+
+    /// <summary>
+    /// Handles changes to the TimeListItemsStyle property.
+    /// </summary>
+    private static void OnTimeListItemsStyleChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( TimePicker )d ).OnTimeListItemsStyleChanged( e );
+    }
+
+    /// <summary>
+    /// Provides derived classes an opportunity to handle changes to the TimeListItemsStyle property.
+    /// </summary>
+    protected virtual void OnTimeListItemsStyleChanged( DependencyPropertyChangedEventArgs e )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion
+
     #region MaxDropDownHeight
 
     public static readonly DependencyProperty MaxDropDownHeightProperty = DependencyProperty.Register( "MaxDropDownHeight", typeof( double ), typeof( TimePicker ), new UIPropertyMetadata( 130d, OnMaxDropDownHeightChanged ) );
@@ -307,7 +349,7 @@ namespace Xceed.Wpf.Toolkit
       {
         this.UpdateListBoxItems();
 
-        var time = (this.Value != null) ? this.Value.Value.TimeOfDay : TimePicker.StartTimeDefaultValue;
+        var time = ( this.Value != null ) ? this.Value.Value.TimeOfDay : TimePicker.StartTimeDefaultValue;
         var nearestItem = this.GetNearestTimeItem( time );
         if( nearestItem != null )
         {
@@ -395,8 +437,8 @@ namespace Xceed.Wpf.Toolkit
         //}
         //else
         //{
-          var date = this.Value ?? this.ContextNow;
-          this.Value = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds, date.Kind );
+        var date = this.Value ?? this.ContextNow;
+        this.Value = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds, date.Kind );
         //}
       }
     }
@@ -476,7 +518,7 @@ namespace Xceed.Wpf.Toolkit
     protected virtual TimeItem CreateTimeItem( TimeSpan time )
     {
       var date = Value ?? this.ContextNow;
-      string formatString = this.GetFormatString( (DateTimeFormat)this.Format );
+      string formatString = this.GetFormatString( ( DateTimeFormat )this.Format );
       return new TimeItem( date.Date.Add( time ).ToString( formatString, CultureInfo ), time );
     }
 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
index 86c38023..cbf4641b 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -70,57 +70,13 @@
   </Style>
 
   <Style x:Key="TimeItemStyle"
-         TargetType="ListBoxItem">
+         TargetType="{x:Type ListBoxItem}">
     <Style.Setters>
-    <Setter Property="Padding"
+      <Setter Property="Padding"
               Value="4" />
     </Style.Setters>
-    <Style.Triggers>
-      <!-- MouseOver Only -->
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver"
-                     Value="True" />
-          <Condition Property="IsSelected"
-                     Value="False" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Background"
-                Value="#FFB8E0F3" />
-        <Setter Property="BorderBrush"
-                Value="#FF26A0DA" />
-      </MultiTrigger>
-
-      <!-- Selected Only -->
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver"
-                     Value="False" />
-          <Condition Property="IsSelected"
-                     Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Background"
-                Value="#FFC4E5F6" />
-        <Setter Property="BorderBrush"
-                Value="#FF26A0DA" />
-      </MultiTrigger>
-
-      <!-- MouseOver + Selected -->
-      <MultiTrigger>
-        <MultiTrigger.Conditions>
-          <Condition Property="IsMouseOver"
-                     Value="True" />
-          <Condition Property="IsSelected"
-                     Value="True" />
-        </MultiTrigger.Conditions>
-        <Setter Property="Background"
-                Value="#FFD1E8FF" />
-        <Setter Property="BorderBrush"
-                Value="#FF66A7E8" />
-      </MultiTrigger>
-    </Style.Triggers>
   </Style>
 
-
   <!-- =============================================================================== -->
   <!-- TimePicker                                                                      -->
   <!-- =============================================================================== -->
@@ -156,6 +112,8 @@
             Value="{StaticResource DropDownArrowGlyph}" />
     <Setter Property="DropDownButtonDisabledContent"
             Value="{StaticResource DropDownDisabledArrowGlyph}" />
+    <Setter Property="TimeListItemsStyle"
+            Value="{StaticResource TimeItemStyle}" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type local:TimePicker}">
@@ -243,7 +201,7 @@
                   <ListBox x:Name="PART_TimeListItems"
                            BorderThickness="0"
                            DisplayMemberPath="Display"
-                           ItemContainerStyle="{StaticResource TimeItemStyle}" >
+                           ItemContainerStyle="{TemplateBinding TimeListItemsStyle}">
                   </ListBox>
                 </Grid>
               </Border>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
index 18aa6cf5..8ed4b2b6 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimePicker/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -150,6 +150,8 @@
             Value="{StaticResource DropDownArrowGlyph}" />
     <Setter Property="DropDownButtonDisabledContent"
             Value="{StaticResource DropDownDisabledArrowGlyph}" />
+    <Setter Property="TimeListItemsStyle"
+            Value="{StaticResource TimeItemStyle}" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="{x:Type local:TimePicker}">
@@ -205,12 +207,12 @@
                           Height="{Binding DropDownButtonHeight, RelativeSource={RelativeSource TemplatedParent}}"
                           Background="White"
                           Focusable="False"
-                          Content="{Binding DropDownButtonContent, RelativeSource={RelativeSource TemplatedParent}}"                          
+                          Content="{Binding DropDownButtonContent, RelativeSource={RelativeSource TemplatedParent}}"
                           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}}" >
+                          Visibility="{TemplateBinding ShowDropDownButton, Converter={StaticResource BooleanToVisibilityConverter}}">
             </ToggleButton>
             <Popup x:Name="PART_Popup"
                    IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}"
@@ -237,7 +239,7 @@
                   <ListBox x:Name="PART_TimeListItems"
                            BorderThickness="0"
                            DisplayMemberPath="Display"
-                           ItemContainerStyle="{StaticResource TimeItemStyle}" >
+                           ItemContainerStyle="{TemplateBinding TimeListItemsStyle}">
                   </ListBox>
                 </Grid>
               </Border>
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
index 0711e888..bba23033 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Implementation/TimeSpanUpDown.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -132,6 +132,35 @@ namespace Xceed.Wpf.Toolkit
 
     #endregion //ShowDays
 
+    #region ShowHours
+
+    public static readonly DependencyProperty ShowHoursProperty = DependencyProperty.Register( "ShowHours", typeof( bool ), typeof( TimeSpanUpDown ), new UIPropertyMetadata( true, OnShowHoursChanged ) );
+    public bool ShowHours
+    {
+      get
+      {
+        return ( bool )GetValue( ShowHoursProperty );
+      }
+      set
+      {
+        SetValue( ShowHoursProperty, value );
+      }
+    }
+
+    private static void OnShowHoursChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      var timeSpanUpDown = o as TimeSpanUpDown;
+      if( timeSpanUpDown != null )
+        timeSpanUpDown.OnShowHoursChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnShowHoursChanged( bool oldValue, bool newValue )
+    {
+      this.UpdateValue();
+    }
+
+    #endregion //ShowHours
+
     #region ShowSeconds
 
     public static readonly DependencyProperty ShowSecondsProperty = DependencyProperty.Register( "ShowSeconds", typeof( bool ), typeof( TimeSpanUpDown ), new UIPropertyMetadata( true, OnShowSecondsChanged ) );
@@ -266,6 +295,14 @@ namespace Xceed.Wpf.Toolkit
         var haveMS = ( separators.Count() > 1 ) && ( separators.Last() == '.' );
         var haveDays = ( separators.Count() > 1 ) && ( separators.First() == '.' ) && ( intValues.Count() >= 3 );
 
+        if( !this.ShowHours )
+        {
+          if( this.ShowDays )
+          {
+            throw new NotSupportedException( "Cannot show days when show hours is set to false." );
+          }
+        }
+
         if( this.ShowDays )
         {
           var days = haveDays ? intValues[ 0 ] : intValues[ 0 ] / 24;
@@ -290,20 +327,37 @@ namespace Xceed.Wpf.Toolkit
         }
         else
         {
-          var hours = intValues[ 0 ];
-          if( hours > TimeSpan.MaxValue.TotalHours )
-            return this.ResetToLastValidValue();
-          var minutes = intValues[ 1 ];
-          if( ( ( hours * TimeSpanUpDown.MinutesInHour ) + minutes ) > TimeSpan.MaxValue.TotalMinutes )
-            return this.ResetToLastValidValue();
-          var seconds = this.ShowSeconds && ( intValues.Count() >= 3 ) ? intValues[ 2 ] : 0;
-          if( ( ( hours * TimeSpanUpDown.SecondsInHour ) + ( minutes * TimeSpanUpDown.SecondsInMinute ) + seconds ) > TimeSpan.MaxValue.TotalSeconds )
-            return this.ResetToLastValidValue();
-          var milliseconds = haveMS ? intValues.Last() : 0;
-          if( ( ( hours * TimeSpanUpDown.MilliSecondsInHour ) + ( minutes * TimeSpanUpDown.MilliSecondsInMinute ) + ( seconds * TimeSpanUpDown.MilliSecondsInSecond ) + milliseconds ) > TimeSpan.MaxValue.TotalMilliseconds )
-            return this.ResetToLastValidValue();
-
-          timeSpan = new TimeSpan( 0, hours, minutes, seconds, milliseconds );
+          if( this.ShowHours )
+          {
+            var hours = intValues[ 0 ];
+            if( hours > TimeSpan.MaxValue.TotalHours )
+              return this.ResetToLastValidValue();
+            var minutes = intValues[ 1 ];
+            if( ( ( hours * TimeSpanUpDown.MinutesInHour ) + minutes ) > TimeSpan.MaxValue.TotalMinutes )
+              return this.ResetToLastValidValue();
+            var seconds = this.ShowSeconds && ( intValues.Count() >= 3 ) ? intValues[ 2 ] : 0;
+            if( ( ( hours * TimeSpanUpDown.SecondsInHour ) + ( minutes * TimeSpanUpDown.SecondsInMinute ) + seconds ) > TimeSpan.MaxValue.TotalSeconds )
+              return this.ResetToLastValidValue();
+            var milliseconds = haveMS ? intValues.Last() : 0;
+            if( ( ( hours * TimeSpanUpDown.MilliSecondsInHour ) + ( minutes * TimeSpanUpDown.MilliSecondsInMinute ) + ( seconds * TimeSpanUpDown.MilliSecondsInSecond ) + milliseconds ) > TimeSpan.MaxValue.TotalMilliseconds )
+              return this.ResetToLastValidValue();
+
+            timeSpan = new TimeSpan( 0, hours, minutes, seconds, milliseconds );
+          }
+          else
+          {
+            var minutes = intValues[ 0 ];
+            if( minutes > TimeSpan.MaxValue.TotalMinutes )
+              return this.ResetToLastValidValue();
+            var seconds = this.ShowSeconds && ( intValues.Count() >= 2 ) ? intValues[ 1 ] : 0;
+            if( ( ( minutes * TimeSpanUpDown.SecondsInMinute ) + seconds ) > TimeSpan.MaxValue.TotalSeconds )
+              return this.ResetToLastValidValue();
+            var milliseconds = haveMS ? intValues.Last() : 0;
+            if( ( ( minutes * TimeSpanUpDown.MilliSecondsInMinute ) + ( seconds * TimeSpanUpDown.MilliSecondsInSecond ) + milliseconds ) > TimeSpan.MaxValue.TotalMilliseconds )
+              return this.ResetToLastValidValue();
+
+            timeSpan = new TimeSpan( 0, 0, minutes, seconds, milliseconds );
+          }
         }
 
         if( text.StartsWith( "-" ) )
@@ -454,6 +508,8 @@ namespace Xceed.Wpf.Toolkit
     {
       var lastDayInfo = _dateTimeInfoList.FirstOrDefault( x => x.Type == DateTimePart.Day );
       bool hasDay = lastDayInfo != null;
+      var lastHourInfo = _dateTimeInfoList.FirstOrDefault( x => x.Type == DateTimePart.Hour12 || x.Type == DateTimePart.Hour24 );
+      bool hasHour = lastHourInfo != null;
       var negInfo = _dateTimeInfoList.FirstOrDefault( x => x.Type == DateTimePart.Other );
       bool hasNegative = ( negInfo != null ) && ( negInfo.Content == "-" );
 
@@ -471,6 +527,14 @@ namespace Xceed.Wpf.Toolkit
         }
       }
 
+      if( !this.ShowHours )
+      {
+        if( this.ShowDays )
+        {
+          throw new NotSupportedException( "Cannot show days when show hours is set to false." );
+        }
+      }
+
       if( this.ShowDays )
       {
         if( value.HasValue )
@@ -506,9 +570,43 @@ namespace Xceed.Wpf.Toolkit
         }
       }
 
-      _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Hour24, Length = 2, Format = "hh" } );
-      _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ":", IsReadOnly = true } );
+      if( this.ShowHours )
+      {
+        if( value.HasValue )
+        {
+          int hourLength = Math.Abs( value.Value.Hours ).ToString( "00" ).Length;
+          _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Hour24, Length = Math.Max( 2, hourLength ), Format = "hh" } );
+          _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ":", IsReadOnly = true } );
+
+          if( this.TextBox != null )
+          {
+            //number of digits for hours has changed when selection is not on date part, move TextBox.Selection to keep it on current DateTimeInfo
+            if( hasHour && ( hourLength != lastHourInfo.Length ) && ( _selectedDateTimeInfo.Type != DateTimePart.Hour24 ) )
+            {
+              _fireSelectionChangedEvent = false;
+              this.TextBox.SelectionStart = Math.Max( 0, this.TextBox.SelectionStart + ( hourLength - lastHourInfo.Length ) );
+              _fireSelectionChangedEvent = true;
+            }
+            // hour has been added, move TextBox.Selection to keep it on current DateTimeInfo
+            else if( !hasHour )
+            {
+              _fireSelectionChangedEvent = false;
+              this.TextBox.SelectionStart += ( hourLength + 1 );
+              _fireSelectionChangedEvent = true;
+            }
+          }
+        }
+        // Hour has been removed, move TextBox.Selection to keep it on current DateTimeInfo
+        else if( hasHour )
+        {
+          _fireSelectionChangedEvent = false;
+          this.TextBox.SelectionStart = Math.Max( hasNegative ? 1 : 0, this.TextBox.SelectionStart - ( lastHourInfo.Length + 1 ) );
+          _fireSelectionChangedEvent = true;
+        }
+      }
+
       _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Minute, Length = 2, Format = "mm" } );
+
       if( this.ShowSeconds )
       {
         _dateTimeInfoList.Add( new DateTimeInfo() { Type = DateTimePart.Other, Length = 1, Content = ":", IsReadOnly = true } );
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml
index 16a54f25..62a3c9ae 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml
index b22cde2a..5461219c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimeSpanUpDown/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
index 2bb2c998..6d87f6a2 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/DateElement.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
index 209601c7..9e930b26 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/OverlapBehavior.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
index 6d516c0b..20635312 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/TimelinePanel/Implementation/TimelinePanel.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -555,7 +555,7 @@ namespace Xceed.Wpf.Toolkit
 
               break;
 
-              #endregion
+            #endregion
 
             //---------------------------------------------------------------------
             //
@@ -598,7 +598,7 @@ namespace Xceed.Wpf.Toolkit
 
               break;
 
-              #endregion
+            #endregion
 
             //---------------------------------------------------------------------
             //
@@ -721,7 +721,7 @@ namespace Xceed.Wpf.Toolkit
 
               break;
 
-              #endregion
+            #endregion
 
             //---------------------------------------------------------------------
             //
@@ -842,7 +842,7 @@ namespace Xceed.Wpf.Toolkit
 
               break;
 
-              #endregion
+            #endregion
 
             //---------------------------------------------------------------------
             //
@@ -885,7 +885,7 @@ namespace Xceed.Wpf.Toolkit
 
               break;
 
-              #endregion
+            #endregion
 
             //---------------------------------------------------------------------
             //
@@ -1008,7 +1008,7 @@ namespace Xceed.Wpf.Toolkit
 
               break;
 
-              #endregion
+            #endregion
 
             //---------------------------------------------------------------------
             //
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Utils/Exceptions/ThrowException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Utils/Exceptions/ThrowException.cs
index bfb3b82b..1a43d818 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Utils/Exceptions/ThrowException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Utils/Exceptions/ThrowException.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -29,40 +29,40 @@ namespace Xceed.Utils.Exceptions
 
     public static void ThrowArgumentException( string message, string paramName, Exception innerExcept )
     {
-      #if ( XCEEDCF || SILVERLIGHT || PORTABLE )
+#if( XCEEDCF || SILVERLIGHT || PORTABLE )
       throw new ArgumentException( message, innerExcept );
-      #else
+#else
       throw new ArgumentException( message, paramName, innerExcept );
-      #endif
+#endif
     }
 
     public static void ThrowArgumentOutOfRangeException( string paramName, object value, string message )
     {
-      #if ( XCEEDCF || SILVERLIGHT || PORTABLE )
+#if( XCEEDCF || SILVERLIGHT || PORTABLE )
       throw new ArgumentOutOfRangeException( message );
-      #else
+#else
       throw new ArgumentOutOfRangeException( paramName, value, message );
-      #endif
+#endif
     }
 
-    #if !NO_CODE_ANALYSIS
+#if !NO_CODE_ANALYSIS
     [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Usage", "CA1801:ReviewUnusedParameters", MessageId = "type" )]
-    #endif // !NO_CODE_ANALYSIS
+#endif // !NO_CODE_ANALYSIS
     public static void ThrowLicenseException( Type type, object instance, string message )
     {
-      #if PORTABLE || NETCORE || NET5
+#if PORTABLE || NETCORE || NET5
       throw new Exception( message );
-      #elif ( XCEEDCF || SILVERLIGHT || XAMARIN )
+#elif ( XCEEDCF || SILVERLIGHT || XAMARIN )
       throw new SystemException( message );
-      #else
-      #if XBAP_FRIENDLY
+#else
+#if XBAP_FRIENDLY
       // Under some circumstances, passing a type to a LicenseException will throw a 
       // FileNotFoundException on the assembly containing the type.
       throw new System.ComponentModel.LicenseException( null, instance, message );
-      #else
+#else
       throw new System.ComponentModel.LicenseException( type, instance, message );
-      #endif // XBAP_FRIENDLY
-      #endif // ( XCEEDCF || NETCORE || NET5)
+#endif // XBAP_FRIENDLY
+#endif // ( XCEEDCF || NETCORE || NET5)
     }
 
     #endregion PUBLIC STATIC METHODS
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs
index 0fdb7e24..b2399821 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/VisualStates.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
index 9a71ae33..b81ac78e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Implementation/WatermarkComboBox.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -17,6 +17,7 @@
 
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Media;
 
 namespace Xceed.Wpf.Toolkit
 {
@@ -56,7 +57,26 @@ namespace Xceed.Wpf.Toolkit
       }
     }
 
-    #endregion //WatermarkTemplate
+    #endregion //WatermarkBackground
+
+    #region WatermarkBackground
+
+    public static readonly DependencyProperty WatermarkBackgroundProperty = DependencyProperty.RegisterAttached(
+        "WatermarkBackground", typeof( Brush ), typeof( WatermarkComboBox ), new PropertyMetadata( ( Brush )null ) );
+
+    public Brush WatermarkBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( WatermarkBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WatermarkBackgroundProperty, value );
+      }
+    }
+
+    #endregion //WatermarkBackground
 
     #endregion //Properties
 
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 165dbd2a..92db6131 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -95,16 +95,8 @@
                   <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>
+                          SnapsToDevicePixels="True"
+                          Background="{Binding WatermarkBackground, RelativeSource={RelativeSource AncestorType={x:Type local:WatermarkComboBox}}}">
                     <Border x:Name="splitBorder"
                             BorderBrush="Transparent"
                             BorderThickness="1"
@@ -131,6 +123,8 @@
                                    Value="false" />
                         <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
                                    Value="true" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot"
@@ -154,6 +148,8 @@
                                    Value="true" />
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
                                    Value="false" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot">
@@ -177,6 +173,8 @@
                                    Value="true" />
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
                                    Value="true" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot"
@@ -212,6 +210,8 @@
                                    Value="true" />
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
                                    Value="false" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot">
@@ -235,6 +235,8 @@
                                    Value="true" />
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
                                    Value="true" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot"
@@ -270,6 +272,8 @@
                                    Value="false" />
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
                                    Value="false" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot"
@@ -284,6 +288,8 @@
                                    Value="false" />
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
                                    Value="true" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot"
@@ -316,7 +322,7 @@
                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
       <Border x:Name="Border"
-              Background="White"
+              Background="{TemplateBinding WatermarkBackground}"
               Margin="{TemplateBinding BorderThickness}"
               Visibility="Collapsed">
         <TextBox x:Name="PART_EditableTextBox"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
index 165dbd2a..92db6131 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkComboBox/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -95,16 +95,8 @@
                   <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>
+                          SnapsToDevicePixels="True"
+                          Background="{Binding WatermarkBackground, RelativeSource={RelativeSource AncestorType={x:Type local:WatermarkComboBox}}}">
                     <Border x:Name="splitBorder"
                             BorderBrush="Transparent"
                             BorderThickness="1"
@@ -131,6 +123,8 @@
                                    Value="false" />
                         <Condition Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}"
                                    Value="true" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot"
@@ -154,6 +148,8 @@
                                    Value="true" />
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
                                    Value="false" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot">
@@ -177,6 +173,8 @@
                                    Value="true" />
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
                                    Value="true" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot"
@@ -212,6 +210,8 @@
                                    Value="true" />
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
                                    Value="false" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot">
@@ -235,6 +235,8 @@
                                    Value="true" />
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
                                    Value="true" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot"
@@ -270,6 +272,8 @@
                                    Value="false" />
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
                                    Value="false" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot"
@@ -284,6 +288,8 @@
                                    Value="false" />
                         <Condition Binding="{Binding IsEditable, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
                                    Value="true" />
+                        <Condition Binding="{Binding WatermarkBackground, RelativeSource={RelativeSource FindAncestor, AncestorLevel=1, AncestorType={x:Type ComboBox}}}"
+                                   Value="{x:Null}" />
                       </MultiDataTrigger.Conditions>
                       <Setter Property="Background"
                               TargetName="templateRoot"
@@ -316,7 +322,7 @@
                         SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
                         VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
       <Border x:Name="Border"
-              Background="White"
+              Background="{TemplateBinding WatermarkBackground}"
               Margin="{TemplateBinding BorderThickness}"
               Visibility="Collapsed">
         <TextBox x:Name="PART_EditableTextBox"
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
index 3beae03f..511a0ff9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkPasswordBox/Implementation/WatermarkPasswordBox.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -85,7 +85,7 @@ namespace Xceed.Wpf.Toolkit
     {
       get
       {
-        return (char)GetValue( PasswordCharProperty );
+        return ( char )GetValue( PasswordCharProperty );
       }
 
       set
@@ -99,7 +99,7 @@ namespace Xceed.Wpf.Toolkit
       var watermarkPasswordBox = o as WatermarkPasswordBox;
       if( watermarkPasswordBox != null )
       {
-        watermarkPasswordBox.OnPasswordCharChanged( (char)e.OldValue, (char)e.NewValue );
+        watermarkPasswordBox.OnPasswordCharChanged( ( char )e.OldValue, ( char )e.NewValue );
       }
     }
 
@@ -164,7 +164,7 @@ namespace Xceed.Wpf.Toolkit
           break;
         case Key.Back:
           // With a selection, delete from CaretIndex. Without a selection delete the character before the CaretIndex.
-          this.PasswordRemove( (this.SelectedText.Length > 0) ? this.CaretIndex : this.CaretIndex - 1 );
+          this.PasswordRemove( ( this.SelectedText.Length > 0 ) ? this.CaretIndex : this.CaretIndex - 1 );
           e.Handled = true;  //Handle to prevent TextChanged when OnPreviewKeyDown exists
           break;
         case Key.Delete:
@@ -172,7 +172,7 @@ namespace Xceed.Wpf.Toolkit
           e.Handled = true;  //Handle to prevent TextChanged when OnPreviewKeyDown exist
           break;
         case Key.V:
-          if( (Keyboard.Modifiers & ModifierKeys.Control) == ModifierKeys.Control )
+          if( ( Keyboard.Modifiers & ModifierKeys.Control ) == ModifierKeys.Control )
           {
             if( Clipboard.ContainsText() )
             {
@@ -240,7 +240,7 @@ namespace Xceed.Wpf.Toolkit
 
     #region Event Handlers
 
-    [ SecuritySafeCritical]
+    [SecuritySafeCritical]
     private void OnPaste( object sender, DataObjectPastingEventArgs e )
     {
       //Pasting something that is not text
@@ -276,7 +276,7 @@ namespace Xceed.Wpf.Toolkit
     {
       if( text == null )
         return;
-      if( (index < 0) || (index > this.Password.Length) )
+      if( ( index < 0 ) || ( index > this.Password.Length ) )
         return;
 
       //If there is a selection, remove it first
@@ -289,7 +289,7 @@ namespace Xceed.Wpf.Toolkit
       for( int i = 0; i < text.Length; ++i )
       {
         // MaxLength == 0 is no limit
-        if( (this.MaxLength == 0) || (newPassword.Length < this.MaxLength) )
+        if( ( this.MaxLength == 0 ) || ( newPassword.Length < this.MaxLength ) )
         {
           newPassword = newPassword.Insert( index++, text[ i ].ToString() );
         }
@@ -300,7 +300,7 @@ namespace Xceed.Wpf.Toolkit
     [SecurityCritical]
     private void PasswordRemove( int index )
     {
-      if( (index < 0) || (index >= this.Password.Length) )
+      if( ( index < 0 ) || ( index >= this.Password.Length ) )
         return;
 
       if( this.SelectedText.Length > 0 )
@@ -308,7 +308,7 @@ namespace Xceed.Wpf.Toolkit
         var newPassword = this.Password;
         for( int i = 0; i < this.SelectedText.Length; ++i )
         {
-          newPassword = newPassword.Remove( index, 1 );          
+          newPassword = newPassword.Remove( index, 1 );
         }
         this.SetPassword( newPassword, index );
       }
@@ -329,7 +329,7 @@ namespace Xceed.Wpf.Toolkit
     private void SyncTextPassword( int nextCarretIndex )
     {
       var sb = new StringBuilder();
-      this.Text = sb.Append( Enumerable.Repeat(this.PasswordChar, this.Password.Length).ToArray() ).ToString();
+      this.Text = sb.Append( Enumerable.Repeat( this.PasswordChar, this.Password.Length ).ToArray() ).ToString();
       //set CaretIndex after Text is changed
       this.CaretIndex = Math.Max( nextCarretIndex, 0 );
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
index 64151ad5..1c09a5dd 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Implementation/WatermarkTextBox.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 5c8c9371..e71566eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
index c70395ea..bbddeeb4 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/WatermarkTextBox/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
index e9c77172..509f2f8a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/Wizard.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -664,7 +664,7 @@ namespace Xceed.Wpf.Toolkit
         if( !e.Cancel )
         {
           // Set dialog result only when closing is not canceled.
-          window.DialogResult = _dialogResult;          
+          window.DialogResult = _dialogResult;
         }
 
         _dialogResult = null;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
index 08c5b2a6..da8aac91 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardCommands.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
index fdeebc5b..c31c3eb0 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPage.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
index 6709888f..dd94de8d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageButtonVisibility.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
index e69f0951..8d84c194 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Implementation/WizardPageType.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
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 87a40056..418b8977 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
index 5840830d..4bb12c71 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Wizard/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.NET5.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.NET5.csproj
new file mode 100644
index 00000000..3204ee07
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Xceed.Wpf.Toolkit.NET5.csproj
@@ -0,0 +1,969 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>obj\net5\</BaseIntermediateOutputPath>
+    <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+    <EnableDefaultItems>false</EnableDefaultItems>
+  </PropertyGroup>
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+  <PropertyGroup>
+    <TargetFramework>net5.0-windows</TargetFramework>
+    <RootNamespace>Xceed.Wpf.Toolkit</RootNamespace>
+    <AssemblyName>Xceed.Wpf.Toolkit.NET5</AssemblyName>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants>TRACE;DEBUG;NET5</DefineConstants>
+    <DebugType>full</DebugType>
+    <DebugSymbols>True</DebugSymbols>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <DefineConstants>TRACE;NET5</DefineConstants>
+    <DebugType>none</DebugType>
+    <DebugSymbols>False</DebugSymbols>
+  </PropertyGroup>
+  <ItemGroup>
+    <Page Include="BusyIndicator\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="BusyIndicator\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="IconButton\Themes\Aero2.NormalColor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="IconButton\Themes\Generic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ButtonSpinner\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ButtonSpinner\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CalculatorUpDown\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CalculatorUpDown\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Calculator\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Calculator\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CheckComboBox\Themes\Aero2.NormalColor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="CheckListBox\Themes\Aero2.NormalColor.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="CheckListBox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ChildWindow\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ChildWindow\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Chromes\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Chromes\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CollectionControl\Implementation\CollectionControlDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="CollectionControl\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CollectionControl\Themes\Generic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="ColorCanvas\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ColorCanvas\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ColorPicker\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="ColorPicker\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="CheckComboBox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Primitives\Themes\Aero2\SelectorItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Primitives\Themes\Aero2\WindowControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Primitives\Themes\Generic\SelectorItem.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Primitives\Themes\Generic\WindowControl.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DateTimePicker\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DateTimePicker\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DateTimeUpDown\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DateTimeUpDown\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DropDownButton\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="DropDownButton\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Magnifier\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MessageBox\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MessageBox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MultiLineTextEditor\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="MultiLineTextEditor\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="NumericUpDown\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="NumericUpDown\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Pie\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Pie\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="PropertyGrid\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="PropertyGrid\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="RangeSlider\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="RangeSlider\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="RichTextBoxFormatBar\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="RichTextBoxFormatBar\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SplitButton\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="SplitButton\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero2\Brushes.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero2\Buttons.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero2\Common.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero2\Glyphs.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero\Brushes_NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Aero\Buttons_NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\classic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Generic.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\Generic\Brushes.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\Generic\Buttons.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Themes\Generic\Common.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\Generic\Glyphs.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\luna.homestead.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\luna.metallic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\luna.normalcolor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Themes\royale.normalcolor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TimePicker\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TimePicker\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TimeSpanUpDown\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="TimeSpanUpDown\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="WatermarkComboBox\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="WatermarkComboBox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="WatermarkTextBox\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="WatermarkTextBox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Wizard\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Wizard\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Zoombox\Themes\Aero2.NormalColor.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Zoombox\Themes\Generic.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="AssemblyVersionInfo.cs" />
+    <Compile Include="AssemblyVersionInfoCommon.cs" />
+    <Compile Include="AutoSelectTextBox\Implementation\AutoSelectBehaviorEnum.cs" />
+    <Compile Include="AutoSelectTextBox\Implementation\AutoSelectTextBox.cs" />
+    <Compile Include="AutoSelectTextBox\Implementation\QueryMoveFocusEventArgs.cs" />
+    <Compile Include="BusyIndicator\Implementation\BusyIndicator.cs" />
+    <Compile Include="BusyIndicator\Implementation\Converters\ProgressBarWidthConverter.cs" />
+    <Compile Include="ColorPicker\Implementation\ColorPickerTabItem.cs" />
+    <Compile Include="Core\Converters\ColorModeToTabItemSelectedConverter.cs" />
+    <Compile Include="Core\Converters\PrintableFontFamilyConverter.cs" />
+    <Compile Include="Core\GenericTextBlock.cs" />
+    <Compile Include="Core\ImageUriExtension.cs" />
+    <Compile Include="Core\PackUriExtension.cs" />
+    <Compile Include="Core\ResourceDictionary.cs" />
+    <Compile Include="DateTimePicker\Implementation\Converters\BorderThicknessConverter.cs" />
+    <Compile Include="Primitives\SelectAllSelectorItem.cs" />
+    <Compile Include="Primitives\SelectAllSelector.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\CategoryPropertyOrderAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\PropertyItemEditorConverter.cs" />
+    <Compile Include="Core\LocationEnum.cs" />
+    <Compile Include="IconButton\Implementation\IconButton.cs" />
+    <Compile Include="ButtonSpinner\Implementation\ButtonSpinner.cs" />
+    <Compile Include="CalculatorUpDown\Implementation\CalculatorUpDown.cs" />
+    <Compile Include="Calculator\Implementation\Calculator.cs" />
+    <Compile Include="Calculator\Implementation\CalculatorCommands.cs" />
+    <Compile Include="CheckListBox\Implementation\CheckListBox.cs" />
+    <Compile Include="ChildWindow\Implementation\ChildWindow.cs" />
+    <Compile Include="ChildWindow\Implementation\WindowStartupLocation.cs" />
+    <Compile Include="ChildWindow\Implementation\WindowState.cs" />
+    <Compile Include="ButtonSpinner\Implementation\SpinDirection.cs" />
+    <Compile Include="ButtonSpinner\Implementation\SpinEventArgs.cs" />
+    <Compile Include="ButtonSpinner\Implementation\Spinner.cs" />
+    <Compile Include="ButtonSpinner\Implementation\ValidSpinDirections.cs" />
+    <Compile Include="Chromes\Implementation\ButtonChrome.cs" />
+    <Compile Include="CheckComboBox\Implementation\CheckComboBox.cs" />
+    <Compile Include="CollectionControl\Implementation\CollectionControl.cs" />
+    <Compile Include="CollectionControl\Implementation\CollectionControlButton.cs" />
+    <Compile Include="CollectionControl\Implementation\CollectionControlDialog.xaml.cs">
+      <DependentUpon>CollectionControlDialog.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="CollectionControl\Implementation\Converters\NewItemTypesComboBoxConverter.cs" />
+    <Compile Include="CollectionControl\Implementation\ItemAddingEventArgs.cs" />
+    <Compile Include="CollectionControl\Implementation\ItemDeletingEventArgs.cs" />
+    <Compile Include="CollectionControl\Implementation\ItemEventArgs.cs" />
+    <Compile Include="CollectionControl\Implementation\PrimitiveTypeCollectionControl.cs" />
+    <Compile Include="ColorPicker\Implementation\ColorSorter.cs" />
+    <Compile Include="Core\CancelRoutedEventArgs.cs" />
+    <Compile Include="Core\Converters\AditionConverter.cs" />
+    <Compile Include="Core\Converters\CenterTitleConverter.cs" />
+    <Compile Include="Core\Converters\ColorBlendConverter.cs" />
+    <Compile Include="Core\Converters\CornerRadiusToDoubleConverter.cs" />
+    <Compile Include="Core\Converters\HalfConverter.cs" />
+    <Compile Include="Core\Converters\IntToThicknessConverter.cs" />
+    <Compile Include="Core\Converters\NullToBoolConverter.cs" />
+    <Compile Include="Core\Converters\ThicknessSideRemovalConverter.cs" />
+    <Compile Include="Core\Converters\ThicknessToDoubleConverter.cs" />
+    <Compile Include="Core\EditableKeyValuePair.cs" />
+    <Compile Include="Primitives\DateTimePickerBase.cs" />
+    <Compile Include="Core\Utilities\DateTimeUtilities.cs" />
+    <Compile Include="PropertyGrid\Implementation\CategoryGroupStyleSelector.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\IsDefaultCategoryConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\IsStringEmptyConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\PropertyNameTextTrimmingConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\CollectionEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\PasswordEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\SourceComboBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyGridContextMenu.cs" />
+    <Compile Include="PropertyGrid\Implementation\TrimmedTextBlock.cs" />
+    <Compile Include="Core\Converters\WindowContentBorderMarginConverter.cs" />
+    <Compile Include="Core\Converters\WindowControlBackgroundConverter.cs" />
+    <Compile Include="Core\Input\IValidateInput.cs" />
+    <Compile Include="Core\Input\InputValidationErrorEventArgs.cs" />
+    <Compile Include="Core\Media\Animation\AnimationRate.cs" />
+    <Compile Include="Core\Media\Animation\AnimationRateConverter.cs" />
+    <Compile Include="Core\Media\Animation\IterativeAnimationEquation.cs" />
+    <Compile Include="Core\Media\Animation\IterativeAnimationEquationDelegate.cs" />
+    <Compile Include="Core\Media\Animation\IterativeEquationConverter.cs" />
+    <Compile Include="Core\Media\Animation\PennerEquation.cs" />
+    <Compile Include="Core\Media\Animation\PennerEquations.cs" />
+    <Compile Include="Core\Media\WindowColors.cs" />
+    <Compile Include="Primitives\CachedTextInfo.cs" />
+    <Compile Include="Core\Converters\ObjectTypeToNameConverter.cs" />
+    <Compile Include="ColorCanvas\Implementation\ColorCanvas.cs" />
+    <Compile Include="Core\Converters\CalculatorMemoryToVisibilityConverter.cs" />
+    <Compile Include="Core\Converters\RoundedValueConverter.cs" />
+    <Compile Include="Core\Converters\VisibilityToBoolConverter.cs" />
+    <Compile Include="Core\Converters\WizardPageButtonVisibilityConverter.cs" />
+    <Compile Include="Core\ErrorMessages.cs" />
+    <Compile Include="Core\IndexChangedEventArgs.cs" />
+    <Compile Include="Core\IndexChangedEventHandler.cs" />
+    <Compile Include="Core\Input\KeyModifier.cs" />
+    <Compile Include="Core\Input\KeyModifierCollection.cs" />
+    <Compile Include="Core\Input\KeyModifierCollectionConverter.cs" />
+    <Compile Include="Core\InvalidContentException.cs" />
+    <Compile Include="Core\InvalidTemplateException.cs" />
+    <Compile Include="Primitives\DateTimeUpDownBase.cs" />
+    <Compile Include="Primitives\HsvColor.cs" />
+    <Compile Include="ColorPicker\Implementation\ColorItem.cs" />
+    <Compile Include="ColorPicker\Implementation\ColorPicker.cs" />
+    <Compile Include="Primitives\MouseWheelActiveTriggerEnum.cs" />
+    <Compile Include="Primitives\WindowContainer.cs" />
+    <Compile Include="Primitives\WindowControl.cs" />
+    <Compile Include="Core\Utilities\ChangeTypeHelper.cs" />
+    <Compile Include="Core\Utilities\FontUtilities.cs" />
+    <Compile Include="Core\Utilities\GeneralUtilities.cs" />
+    <Compile Include="Core\Utilities\KeyboardUtilities.cs" />
+    <Compile Include="Core\Utilities\ListUtilities.cs" />
+    <Compile Include="Core\Utilities\PropertyChangedExt.cs" />
+    <Compile Include="Core\Utilities\RoutedEventHelper.cs" />
+    <Compile Include="Core\Utilities\WeakEventListener.cs" />
+    <Compile Include="Core\Utilities\WindowUtilities.cs" />
+    <Compile Include="Core\VersionResourceDictionary.cs" />
+    <Compile Include="Core\WeakCollectionChangedWrapper.cs" />
+    <Compile Include="NumericUpDown\Implementation\AllowedSpecialValuesEnum.cs" />
+    <Compile Include="Panels\AnimatorConverter.cs" />
+    <Compile Include="Panels\Animators.cs" />
+    <Compile Include="Panels\ChildEnteredEventArgs.cs" />
+    <Compile Include="Panels\ChildEnteredEventHandler.cs" />
+    <Compile Include="Panels\ChildEnteringEventArgs.cs" />
+    <Compile Include="Panels\ChildEnteringEventHandler.cs" />
+    <Compile Include="Panels\ChildExitedEventArgs.cs" />
+    <Compile Include="Panels\ChildExitedEventHandler.cs" />
+    <Compile Include="Panels\ChildExitingEventArgs.cs" />
+    <Compile Include="Panels\ChildExitingEventHandler.cs" />
+    <Compile Include="Panels\DoubleAnimator.cs" />
+    <Compile Include="Panels\IterativeAnimator.cs" />
+    <Compile Include="Panels\PanelBase.cs" />
+    <Compile Include="Primitives\Selector.cs" />
+    <Compile Include="Primitives\SelectorItem.cs" />
+    <Compile Include="Primitives\ShapeBase.cs" />
+    <Compile Include="Primitives\ValueRangeTextBox.cs" />
+    <Compile Include="Core\PropertyChangedEventArgs.cs" />
+    <Compile Include="Core\PropertyChangedEventHandler.cs" />
+    <Compile Include="Core\QueryTextFromValueEventArgs.cs" />
+    <Compile Include="Core\QueryValueFromTextEventArgs.cs" />
+    <Compile Include="Core\Utilities\CalculatorUtilities.cs" />
+    <Compile Include="Core\Utilities\ColorUtilities.cs" />
+    <Compile Include="ColorCanvas\Implementation\ColorSpectrumSlider.cs" />
+    <Compile Include="Core\Converters\ColorToSolidColorBrushConverter.cs" />
+    <Compile Include="Core\Converters\InverseBoolConverter.cs" />
+    <Compile Include="Core\Converters\SolidColorBrushToColorConverter.cs" />
+    <Compile Include="Core\Utilities\ContextMenuUtilities.cs" />
+    <Compile Include="Core\Utilities\TreeHelper.cs" />
+    <Compile Include="Core\Utilities\ValueChangeHelper.cs" />
+    <Compile Include="Core\Utilities\DoubleHelper.cs" />
+    <Compile Include="Core\Utilities\EllipseHelper.cs" />
+    <Compile Include="Core\Utilities\PointHelper.cs" />
+    <Compile Include="Core\Utilities\RectHelper.cs" />
+    <Compile Include="Core\Utilities\ReflectionHelper.cs" />
+    <Compile Include="Core\Utilities\ResourceHelper.cs" />
+    <Compile Include="Core\Utilities\Segment.cs" />
+    <Compile Include="Core\Utilities\VisualTreeHelperEx.cs" />
+    <Compile Include="DateTimePicker\Implementation\DateTimePicker.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimeFormat.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimeInfo.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimePart.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimeUpDown.cs" />
+    <Compile Include="DateTimeUpDown\Implementation\DateTimeParser.cs" />
+    <Compile Include="DropDownButton\Implementation\DropDownButton.cs" />
+    <Compile Include="Magnifier\Implementation\FrameType.cs" />
+    <Compile Include="MaskedTextBox\Implementation\AutoCompletingMaskEventArgs.cs" />
+    <Compile Include="MaskedTextBox\Implementation\InsertKeyModeEnum.cs" />
+    <Compile Include="MaskedTextBox\Implementation\MaskedTextBox.cs" />
+    <Compile Include="MaskedTextBox\Implementation\MaskFormatEnum.cs" />
+    <Compile Include="MultiLineTextEditor\Implementation\MultiLineTextEditor.cs" />
+    <Compile Include="NumericUpDown\Implementation\ByteUpDown.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="NumericUpDown\Implementation\CommonNumericUpDown.cs" />
+    <Compile Include="NumericUpDown\Implementation\DecimalUpDown.cs" />
+    <Compile Include="NumericUpDown\Implementation\DoubleUpDown.cs" />
+    <Compile Include="NumericUpDown\Implementation\SByteUpDown.cs" />
+    <Compile Include="NumericUpDown\Implementation\SingleUpDown.cs" />
+    <Compile Include="NumericUpDown\Implementation\IntegerUpDown.cs" />
+    <Compile Include="Core\Converters\BorderThicknessToStrokeThicknessConverter.cs" />
+    <Compile Include="Magnifier\Implementation\Converters\RadiusConverter.cs" />
+    <Compile Include="Magnifier\Implementation\Magnifier.cs" />
+    <Compile Include="Magnifier\Implementation\MagnifierAdorner.cs" />
+    <Compile Include="Magnifier\Implementation\MagnifierManager.cs" />
+    <Compile Include="Primitives\InputBase.cs" />
+    <Compile Include="Obselete\MaskedTextBox\Implementation\MaskedTextBox.cs" />
+    <Compile Include="MessageBox\Implementation\MessageBox.cs" />
+    <Compile Include="NumericUpDown\Implementation\LongUpDown.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="NumericUpDown\Implementation\NumericUpDown.cs" />
+    <Compile Include="NumericUpDown\Implementation\ShortUpDown.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="NumericUpDown\Implementation\UIntegerUpDown.cs" />
+    <Compile Include="NumericUpDown\Implementation\ULongUpDown.cs" />
+    <Compile Include="NumericUpDown\Implementation\UShortUpDown.cs" />
+    <Compile Include="Panels\AnimationPanel.cs" />
+    <Compile Include="Panels\RandomPanel.cs" />
+    <Compile Include="Panels\ScrollHelper.cs" />
+    <Compile Include="Panels\SwitchPanel.cs" />
+    <Compile Include="Panels\SwitchPresenter.cs" />
+    <Compile Include="Panels\SwitchTemplate.cs" />
+    <Compile Include="Panels\WrapPanel.cs" />
+    <Compile Include="Pie\Implementation\Pie.cs" />
+    <Compile Include="Pie\Implementation\PieModeEnum.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="BusyIndicator\Implementation\VisualStates.BusyIndicator.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\CategoryOrderAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\ExpandableObjectAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\IItemsSource.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\ItemsSourceAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\NewItemTypesAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Attributes\PropertyOrderAttribute.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\ObjectToUIElementConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\Commands\PropertyGridCommands.cs" />
+    <Compile Include="PropertyGrid\Implementation\CommonPropertyExceptionValidationRule.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\ListConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\SelectedObjectConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\EditorTimeSpanConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\CustomPropertyItem.cs" />
+    <Compile Include="PropertyGrid\Implementation\Definitions\EditorTemplateDefinition.cs" />
+    <Compile Include="PropertyGrid\Implementation\Definitions\PropertyDefinitionBase.cs" />
+    <Compile Include="PropertyGrid\Implementation\Definitions\EditorDefinitionBase.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\MaskedTextBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyDefinitionBaseCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\FilterInfo.cs" />
+    <Compile Include="PropertyGrid\Implementation\ObjectContainerHelperBase.cs" />
+    <Compile Include="PropertyGrid\Implementation\DescriptorPropertyDefinitionBase.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\CheckBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\ColorEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\ComboBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\EditorDefinition.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\EnumComboBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\FontComboBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\ItemsSourceAttributeEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\UpDownEditors.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\ITypeEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\PrimitiveTypeCollectionEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\TextBlockEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\TextBoxEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Editors\TypeEditor.cs" />
+    <Compile Include="PropertyGrid\Implementation\Converters\ExpandableObjectMarginConverter.cs" />
+    <Compile Include="PropertyGrid\Implementation\DescriptorPropertyDefinition.cs" />
+    <Compile Include="PropertyGrid\Implementation\IPropertyContainer.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyDefinition.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyGrid.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItemsControl.cs" />
+    <Compile Include="PropertyGrid\Implementation\ContainerHelperBase.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItem.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItemCollection.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyItemBase.cs" />
+    <Compile Include="PropertyGrid\Implementation\Commands\PropertyItemCommands.cs" />
+    <Compile Include="PropertyGrid\Implementation\PropertyGridUtilities.cs" />
+    <Compile Include="PropertyGrid\Implementation\ObjectContainerHelper.cs" />
+    <Compile Include="PropertyGrid\Implementation\StringConstants.cs" />
+    <Compile Include="PropertyGrid\Implementation\TargetPropertyType.cs" />
+    <Compile Include="RangeSlider\Implementation\Converters\SliderThumbWidthConverter.cs" />
+    <Compile Include="RangeSlider\Implementation\RangeSlider.cs" />
+    <Compile Include="RichTextBoxFormatBar\IRichTextBoxFormatBar.cs" />
+    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBar.cs" />
+    <Compile Include="RichTextBoxFormatBar\RichTextBoxFormatBarManager.cs" />
+    <Compile Include="Core\UIElementAdorner.cs" />
+    <Compile Include="RichTextBox\Formatters\ITextFormatter.cs" />
+    <Compile Include="RichTextBox\Formatters\PlainTextFormatter.cs" />
+    <Compile Include="RichTextBox\Formatters\RtfFormatter.cs" />
+    <Compile Include="RichTextBox\Formatters\XamlFormatter.cs" />
+    <Compile Include="RichTextBox\RichTextBox.cs" />
+    <Compile Include="Primitives\UpDownBase.cs" />
+    <Compile Include="SplitButton\Implementation\SplitButton.cs" />
+    <Compile Include="Primitives\Themes\ResourceKeys.cs" />
+    <Compile Include="StyleableWindow\Implementation\Converters\StyleableWindowClippingBorderConverter.cs" />
+    <Compile Include="TimelinePanel\Implementation\DateElement.cs" />
+    <Compile Include="TimelinePanel\Implementation\OverlapBehavior.cs" />
+    <Compile Include="TimelinePanel\Implementation\TimelinePanel.cs" />
+    <Compile Include="TimePicker\Implementation\TimeItem.cs" />
+    <Compile Include="TimePicker\Implementation\TimePicker.cs" />
+    <Compile Include="TimeSpanUpDown\Implementation\TimeSpanUpDown.cs" />
+    <Compile Include="Utils\Exceptions\ThrowException.cs" />
+    <Compile Include="VisualStates.cs" />
+    <Compile Include="MessageBox\Implementation\VisualStates.MessageBox.cs" />
+    <Compile Include="WatermarkComboBox\Implementation\WatermarkComboBox.cs" />
+    <Compile Include="WatermarkPasswordBox\Implementation\WatermarkPasswordBox.cs" />
+    <Compile Include="WatermarkTextBox\Implementation\WatermarkTextBox.cs" />
+    <Compile Include="Wizard\Implementation\WizardCommands.cs" />
+    <Compile Include="Wizard\Implementation\WizardPage.cs" />
+    <Compile Include="Wizard\Implementation\Wizard.cs" />
+    <Compile Include="Wizard\Implementation\WizardPageButtonVisibility.cs" />
+    <Compile Include="Wizard\Implementation\WizardPageType.cs" />
+    <AppDesigner Include="Properties\" />
+    <Compile Include="Zoombox\Zoombox.cs" />
+    <Compile Include="Zoombox\ZoomboxCursors.cs" />
+    <Compile Include="Zoombox\ZoomboxView.cs" />
+    <Compile Include="Zoombox\ZoomboxViewChangedEventArgs.cs" />
+    <Compile Include="Zoombox\ZoomboxViewChangedEventHandler.cs" />
+    <Compile Include="Zoombox\ZoomboxViewConverter.cs" />
+    <Compile Include="Zoombox\ZoomboxViewException.cs" />
+    <Compile Include="Zoombox\ZoomboxViewFinderDisplay.cs" />
+    <Compile Include="Zoombox\ZoomboxViewKind.cs" />
+    <Compile Include="Zoombox\ZoomboxViewStack.cs" />
+    <Compile Include="Zoombox\ZoomboxViewStackMode.cs" />
+    <Compile Include="Zoombox\ZoomboxZoomOn.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="MessageBox\Icons\Error48.png" />
+    <Resource Include="MessageBox\Icons\Information48.png" />
+    <Resource Include="MessageBox\Icons\Question48.png" />
+    <Resource Include="MessageBox\Icons\Warning48.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Bold16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\CenterAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Italic16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\JustifyAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\LeftAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\RightAlign16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Underline16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\FontColorPicker16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\TextHighlightColorPicker16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Bullets16.png" />
+    <Resource Include="RichTextBoxFormatBar\Images\Numbering16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\SortAscending16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\Categorize16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\AdvancedProperties11.png" />
+    <Resource Include="PropertyGrid\Images\Inheritance11.png" />
+    <Resource Include="PropertyGrid\Images\Resource11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\Database11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\Local11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\Style11.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\ClearFilter16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Zoombox\Resources\Zoom.cur" />
+    <Resource Include="Zoombox\Resources\ZoomRelative.cur" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Core\ErrorMessages.resx">
+      <DependentUpon>ErrorMessages.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CollectionControl\Images\Delete16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\close_hover.png" />
+    <Resource Include="Themes\Generic\Images\close_inactive.png" />
+    <Resource Include="Themes\Generic\Images\close_normal.png" />
+    <Resource Include="Themes\Generic\Images\close_pressed.png" />
+    <Resource Include="Themes\Generic\Images\close_rounded_hover.png" />
+    <Resource Include="Themes\Generic\Images\close_rounded_inactive.png" />
+    <Resource Include="Themes\Generic\Images\close_rounded_normal.png" />
+    <Resource Include="Themes\Generic\Images\close_rounded_pressed.png" />
+    <Resource Include="Themes\Generic\Images\close_toolwindow_hover.png" />
+    <Resource Include="Themes\Generic\Images\close_toolwindow_inactive.png" />
+    <Resource Include="Themes\Generic\Images\close_toolwindow_normal.png" />
+    <Resource Include="Themes\Generic\Images\close_toolwindow_pressed.png" />
+    <Resource Include="Themes\Generic\Images\maximize_disabled.png" />
+    <Resource Include="Themes\Generic\Images\maximize_hover.png" />
+    <Resource Include="Themes\Generic\Images\maximize_inactive.png" />
+    <Resource Include="Themes\Generic\Images\maximize_normal.png" />
+    <Resource Include="Themes\Generic\Images\maximize_pressed.png" />
+    <Resource Include="Themes\Generic\Images\minimize_hover.png" />
+    <Resource Include="Themes\Generic\Images\minimize_inactive.png" />
+    <Resource Include="Themes\Generic\Images\minimize_normal.png" />
+    <Resource Include="Themes\Generic\Images\minimize_pressed.png" />
+    <Resource Include="Themes\Generic\Images\resize_grip.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Themes\Generic\Images\restore_disabled.png" />
+    <Resource Include="Themes\Generic\Images\restore_hover.png" />
+    <Resource Include="Themes\Generic\Images\restore_inactive.png" />
+    <Resource Include="Themes\Generic\Images\restore_normal.png" />
+    <Resource Include="Themes\Generic\Images\restore_pressed.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="PropertyGrid\Implementation\Definitions\DefinitionBase.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CollectionControl\Images\Duplicate.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Calculator\Implementation\Calculator.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="AutoSelectTextBox\Implementation\AutoSelectTextBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="BusyIndicator\Implementation\BusyIndicator.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ButtonSpinner\Implementation\ButtonSpinner.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CheckComboBox\Implementation\CheckComboBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CalculatorUpDown\Implementation\CalculatorUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CheckListBox\Implementation\CheckListBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ChildWindow\Implementation\ChildWindow.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CollectionControl\Implementation\CollectionControl.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CollectionControl\Implementation\CollectionControlButton.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="CollectionControl\Implementation\PrimitiveTypeCollectionControl.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ColorCanvas\Implementation\ColorCanvas.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="ColorPicker\Implementation\ColorPicker.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DateTimePicker\Implementation\DateTimePicker.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DateTimeUpDown\Implementation\DateTimeUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="DropDownButton\Implementation\DropDownButton.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="IconButton\Implementation\IconButton.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Magnifier\Implementation\Magnifier.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MaskedTextBox\Implementation\MaskedTextBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MessageBox\Implementation\MessageBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="MultiLineTextEditor\Implementation\MultiLineTextEditor.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\ByteUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\DecimalUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\DoubleUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\IntegerUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\LongUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\SByteUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\ShortUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\SingleUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\UIntegerUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\ULongUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="NumericUpDown\Implementation\UShortUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Panels\RandomPanel.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Panels\WrapPanel.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Pie\Implementation\Pie.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Primitives\ValueRangeTextBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Primitives\WindowContainer.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Primitives\WindowControl.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="PropertyGrid\Implementation\PropertyGrid.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="RangeSlider\Implementation\RangeSlider.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="RichTextBox\RichTextBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="RichTextBoxFormatBar\RichTextBoxFormatBar.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="SplitButton\Implementation\SplitButton.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="StyleableWindow\Implementation\StyleableWindow.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TimelinePanel\Implementation\TimelinePanel.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TimePicker\Implementation\TimePicker.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="TimeSpanUpDown\Implementation\TimeSpanUpDown.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="WatermarkComboBox\Implementation\WatermarkComboBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="WatermarkPasswordBox\Implementation\WatermarkPasswordBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="WatermarkTextBox\Implementation\WatermarkTextBox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Wizard\Implementation\Wizard.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Zoombox\Zoombox.Icon.bmp" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\SortAscending16_White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Bullets_White16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Numbering_White16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Bold_White16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Italic_White16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\Underline_White16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\LeftAlign_White16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\CenterAlign_White16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\RightAlign_White16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\TextHighlightColorPicker_White16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="RichTextBoxFormatBar\Images\FontColorPicker_White16.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CollectionControl\Images\Duplicate_White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="CollectionControl\Images\Delete16_White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\ClearFilter16_White.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="PropertyGrid\Images\ClearFilter16_Green.png" />
+  </ItemGroup>
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+</Project>
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 19a6af60..48a4f66d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Aero2.NormalColor.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
index da83867c..a31022ec 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Themes/Generic.xaml
@@ -2,7 +2,7 @@
 
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
index dcef5917..a6011d3d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/Zoombox.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -82,13 +82,13 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.Loaded += this.Zoombox_Loaded;
     }
 
-#endregion
+    #endregion
 
-#region AnimationAccelerationRatio Property
+    #region AnimationAccelerationRatio Property
 
     public static readonly DependencyProperty AnimationAccelerationRatioProperty =
       DependencyProperty.Register( "AnimationAccelerationRatio", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 0d ), 
+        new FrameworkPropertyMetadata( 0d ),
           new ValidateValueCallback( Zoombox.ValidateAccelerationRatio ) );
 
     public double AnimationAccelerationRatio
@@ -112,13 +112,13 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return true;
     }
 
-#endregion
+    #endregion
 
-#region AnimationDecelerationRatio Property
+    #region AnimationDecelerationRatio Property
 
     public static readonly DependencyProperty AnimationDecelerationRatioProperty =
       DependencyProperty.Register( "AnimationDecelerationRatio", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( 0d ), 
+        new FrameworkPropertyMetadata( 0d ),
           new ValidateValueCallback( Zoombox.ValidateDecelerationRatio ) );
 
     public double AnimationDecelerationRatio
@@ -142,9 +142,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return true;
     }
 
-#endregion
+    #endregion
 
-#region AnimationDuration Property
+    #region AnimationDuration Property
 
     public static readonly DependencyProperty AnimationDurationProperty =
       DependencyProperty.Register( "AnimationDuration", typeof( Duration ), typeof( Zoombox ),
@@ -162,9 +162,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region AreDragModifiersActive Property
+    #region AreDragModifiersActive Property
 
     private static readonly DependencyPropertyKey AreDragModifiersActivePropertyKey =
       DependencyProperty.RegisterReadOnly( "AreDragModifiersActive", typeof( bool ), typeof( Zoombox ),
@@ -185,9 +185,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.SetValue( Zoombox.AreDragModifiersActivePropertyKey, value );
     }
 
-#endregion
+    #endregion
 
-#region AreRelativeZoomModifiersActive Property
+    #region AreRelativeZoomModifiersActive Property
 
     private static readonly DependencyPropertyKey AreRelativeZoomModifiersActivePropertyKey =
       DependencyProperty.RegisterReadOnly( "AreRelativeZoomModifiersActive", typeof( bool ), typeof( Zoombox ),
@@ -208,9 +208,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.SetValue( Zoombox.AreRelativeZoomModifiersActivePropertyKey, value );
     }
 
-#endregion
+    #endregion
 
-#region AreZoomModifiersActive Property
+    #region AreZoomModifiersActive Property
 
     private static readonly DependencyPropertyKey AreZoomModifiersActivePropertyKey =
       DependencyProperty.RegisterReadOnly( "AreZoomModifiersActive", typeof( bool ), typeof( Zoombox ),
@@ -231,9 +231,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.SetValue( Zoombox.AreZoomModifiersActivePropertyKey, value );
     }
 
-#endregion
+    #endregion
 
-#region AreZoomToSelectionModifiersActive Property
+    #region AreZoomToSelectionModifiersActive Property
 
     private static readonly DependencyPropertyKey AreZoomToSelectionModifiersActivePropertyKey =
       DependencyProperty.RegisterReadOnly( "AreZoomToSelectionModifiersActive", typeof( bool ), typeof( Zoombox ),
@@ -254,13 +254,13 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.SetValue( Zoombox.AreZoomToSelectionModifiersActivePropertyKey, value );
     }
 
-#endregion
+    #endregion
 
-#region AutoWrapContentWithViewbox Property
+    #region AutoWrapContentWithViewbox Property
 
     public static readonly DependencyProperty AutoWrapContentWithViewboxProperty =
       DependencyProperty.Register( "AutoWrapContentWithViewbox", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( true, 
+        new FrameworkPropertyMetadata( true,
           new PropertyChangedCallback( Zoombox.OnAutoWrapContentWithViewboxChanged ) ) );
 
     public bool AutoWrapContentWithViewbox
@@ -373,13 +373,13 @@ namespace Xceed.Wpf.Toolkit.Zoombox
 
     private UIElement _trueContent; //null
 
-#endregion
+    #endregion
 
-#region CurrentView Property
+    #region CurrentView Property
 
     private static readonly DependencyPropertyKey CurrentViewPropertyKey =
       DependencyProperty.RegisterReadOnly( "CurrentView", typeof( ZoomboxView ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( ZoomboxView.Empty, 
+        new FrameworkPropertyMetadata( ZoomboxView.Empty,
           new PropertyChangedCallback( Zoombox.OnCurrentViewChanged ) ) );
 
     public static readonly DependencyProperty CurrentViewProperty = Zoombox.CurrentViewPropertyKey.DependencyProperty;
@@ -407,9 +407,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       zoombox.RaiseEvent( new ZoomboxViewChangedEventArgs( e.OldValue as ZoomboxView, e.NewValue as ZoomboxView, zoombox._lastViewIndex, zoombox.CurrentViewIndex ) );
     }
 
-#endregion
+    #endregion
 
-#region CurrentViewIndex Property
+    #region CurrentViewIndex Property
 
     private static readonly DependencyPropertyKey CurrentViewIndexPropertyKey =
       DependencyProperty.RegisterReadOnly( "CurrentViewIndex", typeof( int ), typeof( Zoombox ),
@@ -430,9 +430,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.SetValue( Zoombox.CurrentViewIndexPropertyKey, value );
     }
 
-#endregion
+    #endregion
 
-#region DragModifiers Property
+    #region DragModifiers Property
 
     public static readonly DependencyProperty DragModifiersProperty =
       DependencyProperty.Register( "DragModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
@@ -459,9 +459,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return result;
     }
 
-#endregion
+    #endregion
 
-#region DragOnPreview Property
+    #region DragOnPreview Property
 
     public static readonly DependencyProperty DragOnPreviewProperty =
       DependencyProperty.Register( "DragOnPreview", typeof( bool ), typeof( Zoombox ),
@@ -479,9 +479,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region EffectiveViewStackMode Property
+    #region EffectiveViewStackMode Property
 
     private static readonly DependencyPropertyKey EffectiveViewStackModePropertyKey =
       DependencyProperty.RegisterReadOnly( "EffectiveViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ),
@@ -502,9 +502,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.SetValue( Zoombox.EffectiveViewStackModePropertyKey, value );
     }
 
-#endregion
+    #endregion
 
-#region HasBackStack Property
+    #region HasBackStack Property
 
     private static readonly DependencyPropertyKey HasBackStackPropertyKey =
       DependencyProperty.RegisterReadOnly( "HasBackStack", typeof( bool ), typeof( Zoombox ),
@@ -520,9 +520,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region HasForwardStack Property
+    #region HasForwardStack Property
 
     private static readonly DependencyPropertyKey HasForwardStackPropertyKey =
       DependencyProperty.RegisterReadOnly( "HasForwardStack", typeof( bool ), typeof( Zoombox ),
@@ -538,13 +538,13 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region IsAnimated Property
+    #region IsAnimated Property
 
     public static readonly DependencyProperty IsAnimatedProperty =
       DependencyProperty.Register( "IsAnimated", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( true, 
+        new FrameworkPropertyMetadata( true,
           ( PropertyChangedCallback )null, new CoerceValueCallback( Zoombox.CoerceIsAnimatedValue ) ) );
 
     public bool IsAnimated
@@ -570,9 +570,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return result;
     }
 
-#endregion
+    #endregion
 
-#region IsDraggingContent Property
+    #region IsDraggingContent Property
 
     private static readonly DependencyPropertyKey IsDraggingContentPropertyKey =
       DependencyProperty.RegisterReadOnly( "IsDraggingContent", typeof( bool ), typeof( Zoombox ),
@@ -593,9 +593,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.SetValue( Zoombox.IsDraggingContentPropertyKey, value );
     }
 
-#endregion
+    #endregion
 
-#region IsSelectingRegion Property
+    #region IsSelectingRegion Property
 
     private static readonly DependencyPropertyKey IsSelectingRegionPropertyKey =
       DependencyProperty.RegisterReadOnly( "IsSelectingRegion", typeof( bool ), typeof( Zoombox ),
@@ -616,9 +616,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.SetValue( Zoombox.IsSelectingRegionPropertyKey, value );
     }
 
-#endregion
+    #endregion
 
-#region IsUsingScrollBars Property
+    #region IsUsingScrollBars Property
 
     public static readonly DependencyProperty IsUsingScrollBarsProperty =
       DependencyProperty.Register( "IsUsingScrollBars", typeof( bool ), typeof( Zoombox ),
@@ -636,9 +636,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region MaxScale Property
+    #region MaxScale Property
 
     public static readonly DependencyProperty MaxScaleProperty =
       DependencyProperty.Register( "MaxScale", typeof( double ), typeof( Zoombox ),
@@ -675,9 +675,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return result;
     }
 
-#endregion
+    #endregion
 
-#region MinScale Property
+    #region MinScale Property
 
     public static readonly DependencyProperty MinScaleProperty =
       DependencyProperty.Register( "MinScale", typeof( double ), typeof( Zoombox ),
@@ -714,9 +714,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return result;
     }
 
-#endregion
+    #endregion
 
-#region NavigateOnPreview Property
+    #region NavigateOnPreview Property
 
     public static readonly DependencyProperty NavigateOnPreviewProperty =
       DependencyProperty.Register( "NavigateOnPreview", typeof( bool ), typeof( Zoombox ),
@@ -734,9 +734,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region PanDistance Property
+    #region PanDistance Property
 
     public static readonly DependencyProperty PanDistanceProperty =
       DependencyProperty.Register( "PanDistance", typeof( double ), typeof( Zoombox ),
@@ -754,9 +754,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region Position Property
+    #region Position Property
 
     public static readonly DependencyProperty PositionProperty =
       DependencyProperty.Register( "Position", typeof( Point ), typeof( Zoombox ),
@@ -788,9 +788,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region RelativeZoomModifiers Property
+    #region RelativeZoomModifiers Property
 
     public static readonly DependencyProperty RelativeZoomModifiersProperty =
       DependencyProperty.Register( "RelativeZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
@@ -818,13 +818,13 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return result;
     }
 
-#endregion
+    #endregion
 
-#region Scale Property
+    #region Scale Property
 
     public static readonly DependencyProperty ScaleProperty =
       DependencyProperty.Register( "Scale", typeof( double ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( double.NaN, 
+        new FrameworkPropertyMetadata( double.NaN,
           new PropertyChangedCallback( Zoombox.OnScaleChanged ), new CoerceValueCallback( Zoombox.CoerceScaleValue ) ) );
 
     public double Scale
@@ -867,9 +867,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return result;
     }
 
-#endregion
+    #endregion
 
-#region ViewFinder Property
+    #region ViewFinder Property
 
     private static readonly DependencyPropertyKey ViewFinderPropertyKey =
       DependencyProperty.RegisterReadOnly( "ViewFinder", typeof( FrameworkElement ), typeof( Zoombox ),
@@ -900,9 +900,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       _isUsingDefaultViewFinder = false;
     }
 
-#endregion
+    #endregion
 
-#region ViewFinderVisibility Attached Property
+    #region ViewFinderVisibility Attached Property
 
     public static readonly DependencyProperty ViewFinderVisibilityProperty =
       DependencyProperty.RegisterAttached( "ViewFinderVisibility", typeof( Visibility ), typeof( Zoombox ),
@@ -918,13 +918,13 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       d.SetValue( Zoombox.ViewFinderVisibilityProperty, value );
     }
 
-#endregion
+    #endregion
 
-#region Viewport Property
+    #region Viewport Property
 
     private static readonly DependencyPropertyKey ViewportPropertyKey =
       DependencyProperty.RegisterReadOnly( "Viewport", typeof( Rect ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( Rect.Empty, 
+        new FrameworkPropertyMetadata( Rect.Empty,
           new PropertyChangedCallback( Zoombox.OnViewportChanged ) ) );
 
     public static readonly DependencyProperty ViewportProperty = Zoombox.ViewportPropertyKey.DependencyProperty;
@@ -944,9 +944,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       zoombox.Position = new Point( -zoombox.Viewport.Left * zoombox.Scale / zoombox._viewboxFactor, -zoombox.Viewport.Top * zoombox.Scale / zoombox._viewboxFactor );
     }
 
-#endregion
+    #endregion
 
-#region ViewStackCount Property
+    #region ViewStackCount Property
 
     private static readonly DependencyPropertyKey ViewStackCountPropertyKey =
       DependencyProperty.RegisterReadOnly( "ViewStackCount", typeof( int ), typeof( Zoombox ),
@@ -981,9 +981,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.UpdateStackProperties();
     }
 
-#endregion
+    #endregion
 
-#region ViewStackIndex Property
+    #region ViewStackIndex Property
 
     public static readonly DependencyProperty ViewStackIndexProperty =
       DependencyProperty.Register( "ViewStackIndex", typeof( int ), typeof( Zoombox ),
@@ -1033,11 +1033,11 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return ( zoombox.EffectiveViewStackMode == ZoomboxViewStackMode.Disabled ) ? -1 : value;
     }
 
-#endregion
+    #endregion
 
-#region ViewStackMode Property
+    #region ViewStackMode Property
 
-    public static readonly DependencyProperty ViewStackModeProperty = 
+    public static readonly DependencyProperty ViewStackModeProperty =
       DependencyProperty.Register( "ViewStackMode", typeof( ZoomboxViewStackMode ), typeof( Zoombox ),
         new FrameworkPropertyMetadata( ZoomboxViewStackMode.Default,
           new PropertyChangedCallback( Zoombox.OnViewStackModeChanged ), new CoerceValueCallback( Zoombox.CoerceViewStackModeValue ) ) );
@@ -1097,9 +1097,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return value;
     }
 
-#endregion
+    #endregion
 
-#region ViewStackSource Property
+    #region ViewStackSource Property
 
     public static readonly DependencyProperty ViewStackSourceProperty =
       DependencyProperty.Register( "ViewStackSource", typeof( IEnumerable ), typeof( Zoombox ),
@@ -1150,9 +1150,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       zoombox.CoerceValue( Zoombox.ViewStackModeProperty );
     }
 
-#endregion
+    #endregion
 
-#region ZoomModifiers Property
+    #region ZoomModifiers Property
 
     public static readonly DependencyProperty ZoomModifiersProperty =
       DependencyProperty.Register( "ZoomModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
@@ -1179,9 +1179,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return result;
     }
 
-#endregion
+    #endregion
 
-#region ZoomOnPreview Property
+    #region ZoomOnPreview Property
 
     public static readonly DependencyProperty ZoomOnPreviewProperty =
       DependencyProperty.Register( "ZoomOnPreview", typeof( bool ), typeof( Zoombox ),
@@ -1199,9 +1199,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region ZoomOrigin Property
+    #region ZoomOrigin Property
 
     public static readonly DependencyProperty ZoomOriginProperty =
       DependencyProperty.Register( "ZoomOrigin", typeof( Point ), typeof( Zoombox ),
@@ -1219,9 +1219,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region ZoomPercentage Property
+    #region ZoomPercentage Property
 
     public static readonly DependencyProperty ZoomPercentageProperty =
       DependencyProperty.Register( "ZoomPercentage", typeof( double ), typeof( Zoombox ),
@@ -1239,9 +1239,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region ZoomOn Property
+    #region ZoomOn Property
 
     public static readonly DependencyProperty ZoomOnProperty =
       DependencyProperty.Register( "ZoomOn", typeof( ZoomboxZoomOn ), typeof( Zoombox ),
@@ -1259,9 +1259,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region ZoomToSelectionModifiers Property
+    #region ZoomToSelectionModifiers Property
 
     public static readonly DependencyProperty ZoomToSelectionModifiersProperty =
       DependencyProperty.Register( "ZoomToSelectionModifiers", typeof( KeyModifierCollection ), typeof( Zoombox ),
@@ -1288,13 +1288,13 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return result;
     }
 
-#endregion
+    #endregion
 
-#region KeepContentInBounds Property
+    #region KeepContentInBounds Property
 
     public static readonly DependencyProperty KeepContentInBoundsProperty =
       DependencyProperty.Register( "KeepContentInBounds", typeof( bool ), typeof( Zoombox ),
-        new FrameworkPropertyMetadata( false, 
+        new FrameworkPropertyMetadata( false,
           new PropertyChangedCallback( Zoombox.OnKeepContentInBoundsChanged ) ) );
 
     public bool KeepContentInBounds
@@ -1331,9 +1331,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region ViewStack Property
+    #region ViewStack Property
 
     public ZoomboxViewStack ViewStack
     {
@@ -1347,9 +1347,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region HasArrangedContentPresenter Internal Property
+    #region HasArrangedContentPresenter Internal Property
 
     internal bool HasArrangedContentPresenter
     {
@@ -1363,9 +1363,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region IsUpdatingView Internal Property
+    #region IsUpdatingView Internal Property
 
     internal bool IsUpdatingView
     {
@@ -1379,9 +1379,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region ContentOffset Private Property
+    #region ContentOffset Private Property
 
     private Vector ContentOffset
     {
@@ -1423,9 +1423,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region ContentRect Private Property
+    #region ContentRect Private Property
 
     private Rect ContentRect
     {
@@ -1436,9 +1436,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region HasRenderedFirstView Private Property
+    #region HasRenderedFirstView Private Property
 
     private bool HasRenderedFirstView
     {
@@ -1452,9 +1452,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region HasUIPermission Private Property
+    #region HasUIPermission Private Property
 
     private bool HasUIPermission
     {
@@ -1464,9 +1464,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region IsContentWrapped Private Property
+    #region IsContentWrapped Private Property
 
     private bool IsContentWrapped
     {
@@ -1480,9 +1480,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region IsDraggingViewport Private Property
+    #region IsDraggingViewport Private Property
 
     private bool IsDraggingViewport
     {
@@ -1496,9 +1496,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region IsMonitoringInput Private Property
+    #region IsMonitoringInput Private Property
 
     private bool IsMonitoringInput
     {
@@ -1512,9 +1512,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region IsResizingViewport Private Property
+    #region IsResizingViewport Private Property
 
     private bool IsResizingViewport
     {
@@ -1528,9 +1528,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region IsUpdatingViewport Private Property
+    #region IsUpdatingViewport Private Property
 
     private bool IsUpdatingViewport
     {
@@ -1544,9 +1544,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region RefocusViewOnFirstRender Private Property
+    #region RefocusViewOnFirstRender Private Property
 
     private bool RefocusViewOnFirstRender
     {
@@ -1560,9 +1560,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region ViewFinderDisplayRect Private Property
+    #region ViewFinderDisplayRect Private Property
 
     private Rect ViewFinderDisplayRect
     {
@@ -1573,9 +1573,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region AnimationBeginning Event
+    #region AnimationBeginning Event
 
     public static readonly RoutedEvent AnimationBeginningEvent = EventManager.RegisterRoutedEvent( "AnimationBeginning", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) );
 
@@ -1591,9 +1591,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region AnimationCompleted Event
+    #region AnimationCompleted Event
 
     public static readonly RoutedEvent AnimationCompletedEvent = EventManager.RegisterRoutedEvent( "AnimationCompleted", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( Zoombox ) );
 
@@ -1609,9 +1609,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region CurrentViewChanged Event
+    #region CurrentViewChanged Event
 
     public static readonly RoutedEvent CurrentViewChangedEvent = EventManager.RegisterRoutedEvent( "CurrentViewChanged", RoutingStrategy.Bubble, typeof( ZoomboxViewChangedEventHandler ), typeof( Zoombox ) );
 
@@ -1627,11 +1627,11 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
     public event EventHandler<ScrollEventArgs> Scroll;
 
-#region ViewStackIndexChanged Event
+    #region ViewStackIndexChanged Event
 
     public static readonly RoutedEvent ViewStackIndexChangedEvent = EventManager.RegisterRoutedEvent( "ViewStackIndexChanged", RoutingStrategy.Bubble, typeof( IndexChangedEventHandler ), typeof( Zoombox ) );
 
@@ -1647,9 +1647,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       }
     }
 
-#endregion
+    #endregion
 
-#region Back Command
+    #region Back Command
 
     public static RoutedUICommand Back = new RoutedUICommand( "Go Back", "GoBack", typeof( Zoombox ) );
 
@@ -1664,9 +1664,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.GoBack();
     }
 
-#endregion
+    #endregion
 
-#region Center Command
+    #region Center Command
 
     public static RoutedUICommand Center = new RoutedUICommand( "Center Content", "Center", typeof( Zoombox ) );
 
@@ -1675,9 +1675,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.CenterContent();
     }
 
-#endregion
+    #endregion
 
-#region Fill Command
+    #region Fill Command
 
     public static RoutedUICommand Fill = new RoutedUICommand( "Fill Bounds with Content", "FillToBounds", typeof( Zoombox ) );
 
@@ -1686,9 +1686,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.FillToBounds();
     }
 
-#endregion
+    #endregion
 
-#region Fit Command
+    #region Fit Command
 
     public static RoutedUICommand Fit = new RoutedUICommand( "Fit Content within Bounds", "FitToBounds", typeof( Zoombox ) );
 
@@ -1697,9 +1697,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.FitToBounds();
     }
 
-#endregion
+    #endregion
 
-#region Forward Command
+    #region Forward Command
 
     public static RoutedUICommand Forward = new RoutedUICommand( "Go Forward", "GoForward", typeof( Zoombox ) );
 
@@ -1714,9 +1714,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.GoForward();
     }
 
-#endregion
+    #endregion
 
-#region Home Command
+    #region Home Command
 
     public static RoutedUICommand Home = new RoutedUICommand( "Go Home", "GoHome", typeof( Zoombox ) );
 
@@ -1732,9 +1732,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.GoHome();
     }
 
-#endregion
+    #endregion
 
-#region PanDown Command
+    #region PanDown Command
 
     public static RoutedUICommand PanDown = new RoutedUICommand( "Pan Down", "PanDown", typeof( Zoombox ) );
 
@@ -1743,9 +1743,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.Position = new Point( _basePosition.X, _basePosition.Y + PanDistance );
     }
 
-#endregion
+    #endregion
 
-#region PanLeft Command
+    #region PanLeft Command
 
     public static RoutedUICommand PanLeft = new RoutedUICommand( "Pan Left", "PanLeft", typeof( Zoombox ) );
 
@@ -1754,9 +1754,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.Position = new Point( _basePosition.X - this.PanDistance, _basePosition.Y );
     }
 
-#endregion
+    #endregion
 
-#region PanRight Command
+    #region PanRight Command
 
     public static RoutedUICommand PanRight = new RoutedUICommand( "Pan Right", "PanRight", typeof( Zoombox ) );
 
@@ -1765,9 +1765,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.Position = new Point( _basePosition.X + this.PanDistance, _basePosition.Y );
     }
 
-#endregion
+    #endregion
 
-#region PanUp Command
+    #region PanUp Command
 
     public static RoutedUICommand PanUp = new RoutedUICommand( "Pan Up", "PanUp", typeof( Zoombox ) );
 
@@ -1776,9 +1776,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.Position = new Point( _basePosition.X, _basePosition.Y - this.PanDistance );
     }
 
-#endregion
+    #endregion
 
-#region Refocus Command
+    #region Refocus Command
 
     public static RoutedUICommand Refocus = new RoutedUICommand( "Refocus View", "Refocus", typeof( Zoombox ) );
 
@@ -1794,9 +1794,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.RefocusView();
     }
 
-#endregion
+    #endregion
 
-#region ZoomIn Command
+    #region ZoomIn Command
 
     public static RoutedUICommand ZoomIn = new RoutedUICommand( "Zoom In", "ZoomIn", typeof( Zoombox ) );
 
@@ -1805,9 +1805,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.Zoom( this.ZoomPercentage / 100 );
     }
 
-#endregion
+    #endregion
 
-#region ZoomOut Command
+    #region ZoomOut Command
 
     public static RoutedUICommand ZoomOut = new RoutedUICommand( "Zoom Out", "ZoomOut", typeof( Zoombox ) );
 
@@ -1816,7 +1816,7 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       this.Zoom( -this.ZoomPercentage / 100 );
     }
 
-#endregion
+    #endregion
 
     public void CenterContent()
     {
@@ -2149,7 +2149,7 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       VisualTreeHelperEx.FindDescendantWithPropertyValue( this, Button.IsPressedProperty, true );
 
       // User has not defined a ViewFinder(or is using the one from this template), use the one from this template
-      if( (this.GetValue( Zoombox.ViewFinderPropertyKey.DependencyProperty ) == null) || _isUsingDefaultViewFinder )
+      if( ( this.GetValue( Zoombox.ViewFinderPropertyKey.DependencyProperty ) == null ) || _isUsingDefaultViewFinder )
       {
         // set a reference to the ViewFinder element, if present
         this.SetValue( Zoombox.ViewFinderPropertyKey, this.Template.FindName( "ViewFinder", this ) as FrameworkElement );
@@ -2299,7 +2299,7 @@ namespace Xceed.Wpf.Toolkit.Zoombox
     private void DetachFromVisualTree()
     {
       // remove the drag adorner
-      if( (_dragAdorner != null) && ( AdornerLayer.GetAdornerLayer( this ) != null ) )
+      if( ( _dragAdorner != null ) && ( AdornerLayer.GetAdornerLayer( this ) != null ) )
         AdornerLayer.GetAdornerLayer( this ).Remove( _dragAdorner );
 
       this.InputBindings.Clear();
@@ -2343,7 +2343,7 @@ namespace Xceed.Wpf.Toolkit.Zoombox
 
     private void VerticalScrollBar_Scroll( object sender, ScrollEventArgs e )
     {
-      double diff = -(e.NewValue + _relativePosition.Y);
+      double diff = -( e.NewValue + _relativePosition.Y );
 
       if( e.ScrollEventType == ScrollEventType.LargeIncrement )
       {
@@ -3690,7 +3690,7 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return zoomPoint;
     }
 
-#region OnKeyDown Methods
+    #region OnKeyDown Methods
 
     protected override void OnPreviewKeyDown( KeyEventArgs e )
     {
@@ -3712,9 +3712,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       base.OnKeyDown( e );
     }
 
-#endregion
+    #endregion
 
-#region OnMouseDown Methods
+    #region OnMouseDown Methods
 
     protected override void OnPreviewMouseDown( MouseButtonEventArgs e )
     {
@@ -3736,9 +3736,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       base.OnMouseDown( e );
     }
 
-#endregion
+    #endregion
 
-#region OnMouseEnter Methods
+    #region OnMouseEnter Methods
 
     protected override void OnMouseEnter( MouseEventArgs e )
     {
@@ -3747,9 +3747,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       base.OnMouseEnter( e );
     }
 
-#endregion
+    #endregion
 
-#region OnMouseLeave Methods
+    #region OnMouseLeave Methods
 
     protected override void OnMouseLeave( MouseEventArgs e )
     {
@@ -3758,9 +3758,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       base.OnMouseLeave( e );
     }
 
-#endregion
+    #endregion
 
-#region OnMouseLeftButton Methods
+    #region OnMouseLeftButton Methods
 
     protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
     {
@@ -3802,9 +3802,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       base.OnMouseLeftButtonUp( e );
     }
 
-#endregion
+    #endregion
 
-#region OnMouseMove Methods
+    #region OnMouseMove Methods
 
     protected override void OnPreviewMouseMove( MouseEventArgs e )
     {
@@ -3826,9 +3826,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       base.OnMouseMove( e );
     }
 
-#endregion
+    #endregion
 
-#region OnMouseWheel Methods
+    #region OnMouseWheel Methods
 
     protected override void OnPreviewMouseWheel( MouseWheelEventArgs e )
     {
@@ -3850,9 +3850,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       base.OnMouseWheel( e );
     }
 
-#endregion
+    #endregion
 
-#region Private Fields
+    #region Private Fields
 
     // the default value for a single mouse wheel delta appears to be 28
     private static int MOUSE_WHEEL_DELTA = 28;
@@ -3896,9 +3896,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
 
     private BitVector32 _cacheBits = new BitVector32( 0 );
 
-#endregion
+    #endregion
 
-#region ViewFinderSelectionConverter Nested Type
+    #region ViewFinderSelectionConverter Nested Type
 
     private sealed class ViewFinderSelectionConverter : IValueConverter
     {
@@ -3931,9 +3931,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       private readonly Zoombox _zoombox;
     }
 
-#endregion
+    #endregion
 
-#region DragAdorner Nested Type
+    #region DragAdorner Nested Type
 
     internal sealed class DragAdorner : Adorner
     {
@@ -4031,9 +4031,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       private Size _cachedSize;
     }
 
-#endregion
+    #endregion
 
-#region CacheBits Nested Type
+    #region CacheBits Nested Type
 
     private enum CacheBits
     {
@@ -4049,9 +4049,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       HasUIPermission = 0x00000200,
     }
 
-#endregion
+    #endregion
 
-#region ResizeEdge Nested Type
+    #region ResizeEdge Nested Type
 
     private enum ResizeEdge
     {
@@ -4066,6 +4066,6 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       Bottom,
     }
 
-#endregion
+    #endregion
   }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
index 83355339..51be3c4e 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxCursors.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
index 5661c0f3..599c3a0c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxView.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -18,8 +18,8 @@
 using System;
 using System.ComponentModel;
 using System.Windows;
-using Xceed.Wpf.Toolkit.Core.Utilities;
 using Xceed.Wpf.Toolkit.Core;
+using Xceed.Wpf.Toolkit.Core.Utilities;
 
 namespace Xceed.Wpf.Toolkit.Zoombox
 {
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
index 3e163120..9040f892 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventArgs.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
index bde3bf9e..13713f72 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewChangedEventHandler.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
index 5b28ef51..9b30bc15 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewConverter.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -59,9 +59,9 @@ namespace Xceed.Wpf.Toolkit.Zoombox
           || ( base.CanConvertTo( typeDescriptorContext, type ) );
     }
 
-    public override object ConvertFrom( 
+    public override object ConvertFrom(
       ITypeDescriptorContext typeDescriptorContext,
-      CultureInfo cultureInfo, 
+      CultureInfo cultureInfo,
       object value )
     {
       ZoomboxView result = null;
@@ -145,10 +145,10 @@ namespace Xceed.Wpf.Toolkit.Zoombox
       return ( result == null ? base.ConvertFrom( typeDescriptorContext, cultureInfo, value ) : result );
     }
 
-    public override object ConvertTo( 
+    public override object ConvertTo(
       ITypeDescriptorContext typeDescriptorContext,
-      CultureInfo cultureInfo, 
-      object value, 
+      CultureInfo cultureInfo,
+      object value,
       Type destinationType )
     {
       object result = null;
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
index 7a5dff45..dafad267 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewException.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
@@ -23,7 +23,7 @@ namespace Xceed.Wpf.Toolkit.Zoombox
   {
     #region Constructors
 
-    public ZoomboxViewException( string message ) 
+    public ZoomboxViewException( string message )
       : base( message )
     {
     }
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
index caba51eb..02e9553c 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewFinderDisplay.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
index fa0c99d3..2cdf504a 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewKind.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
index 908fbb18..bc26190d 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStack.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
index 2a152a3a..d16a3904 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxViewStackMode.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
index e8b2a203..2e802b86 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit/Zoombox/ZoomboxZoomOn.cs
@@ -2,7 +2,7 @@
    
    Toolkit for WPF
 
-   Copyright (C) 2007-2020 Xceed Software Inc.
+   Copyright (C) 2007-2022 Xceed Software Inc.
 
    This program is provided to you under the terms of the XCEED SOFTWARE, INC.
    COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at 
diff --git a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.NET5.sln b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.NET5.sln
new file mode 100644
index 00000000..c4313502
--- /dev/null
+++ b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.NET5.sln
@@ -0,0 +1,64 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29418.71
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.Toolkit.LiveExplorer.NET5", "Src\Xceed.Wpf.Toolkit.LiveExplorer\Xceed.Wpf.Toolkit.LiveExplorer.NET5.csproj", "{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21} = {B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244} = {DB81988F-E0F2-45A0-A1FD-8C37F3D35244}
+		{89286EB4-B4A1-418C-839A-067B00F442D8} = {89286EB4-B4A1-418C-839A-067B00F442D8}
+		{72E591D6-8F83-4D8C-8F67-9C325E623234} = {72E591D6-8F83-4D8C-8F67-9C325E623234}
+		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B} = {BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}
+	EndProjectSection
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.Toolkit.NET5", "Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.NET5.csproj", "{72E591D6-8F83-4D8C-8F67-9C325E623234}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.NET5", "Src\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.NET5.csproj", "{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Themes", "Themes", "{8976E4A6-FF5F-44C5-AC57-FEDA249DD199}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.VS2010.NET5", "Src\Xceed.Wpf.AvalonDock.Themes.VS2010\Xceed.Wpf.AvalonDock.Themes.VS2010.NET5.csproj", "{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Metro.NET5", "Src\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.NET5.csproj", "{89286EB4-B4A1-418C-839A-067B00F442D8}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.AvalonDock.Themes.Aero.NET5", "Src\Xceed.Wpf.AvalonDock.Themes.Aero\Xceed.Wpf.AvalonDock.Themes.Aero.NET5.csproj", "{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{72E591D6-8F83-4D8C-8F67-9C325E623234}.Release|Any CPU.Build.0 = Release|Any CPU
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}.Release|Any CPU.Build.0 = Release|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{89286EB4-B4A1-418C-839A-067B00F442D8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {5B29CA6B-7CCA-4E10-8788-C2902D49C5AE}
+	EndGlobalSection
+EndGlobal