From f0775d4061e3f8e2c358fb8d2cf5a8077f71bc60 Mon Sep 17 00:00:00 2001
From: Nebuleux_cp <XceedBoucherS@users.noreply.github.com>
Date: Thu, 8 Mar 2012 15:03:27 +0000
Subject: [PATCH] Add a license description in the header of every .cs and
 .xaml files.

---
 .../BusyIndicatorModule.cs                    |   57 +-
 .../NavigationItems/BusyIndicatorNavItem.xaml |   36 +-
 .../BusyIndicatorNavItem.xaml.cs              |   36 +-
 .../Properties/AssemblyInfo.cs                |   52 +-
 .../Resources/Common.xaml                     |   92 +-
 ...usyIndicatorCustomContentTemplateView.xaml |  130 +-
 ...IndicatorCustomContentTemplateView.xaml.cs |   39 +-
 .../Views/BusyIndicatorCustomContentView.xaml |   88 +-
 .../BusyIndicatorCustomContentView.xaml.cs    |   39 +-
 .../Views/BusyIndicatorView.xaml              |  120 +-
 .../Views/BusyIndicatorView.xaml.cs           |   62 +-
 .../Samples.Modules.Button/ButtonModule.cs    |   59 +-
 .../NavigationItems/ButtonSpinnerNavItem.xaml |   30 +-
 .../ButtonSpinnerNavItem.xaml.cs              |   35 +-
 .../DropDownButtonNavItem.xaml                |   30 +-
 .../DropDownButtonNavItem.xaml.cs             |   35 +-
 .../NavigationItems/SplitButtonNavItem.xaml   |   30 +-
 .../SplitButtonNavItem.xaml.cs                |   35 +-
 .../Properties/AssemblyInfo.cs                |   52 +-
 .../Views/ButtonSpinnerView.xaml              |  106 +-
 .../Views/ButtonSpinnerView.xaml.cs           |   82 +-
 .../Views/DropDownButtonView.xaml             |  100 +-
 .../Views/DropDownButtonView.xaml.cs          |   59 +-
 .../Views/SplitButtonView.xaml                |   99 +-
 .../Views/SplitButtonView.xaml.cs             |   59 +-
 .../CalculatorModule.cs                       |   55 +-
 .../NavigationItems/CalculatorNavItem.xaml    |   32 +-
 .../NavigationItems/CalculatorNavItem.xaml.cs |   35 +-
 .../CalculatorUpDownNavItem.xaml              |   32 +-
 .../CalculatorUpDownNavItem.xaml.cs           |   35 +-
 .../Properties/AssemblyInfo.cs                |   52 +-
 .../Views/CalculatorUpDownView.xaml           |  130 +-
 .../Views/CalculatorUpDownView.xaml.cs        |   39 +-
 .../Views/CalculatorView.xaml                 |   84 +-
 .../Views/CalculatorView.xaml.cs              |   39 +-
 .../ChildWindowModule.cs                      |   49 +-
 .../Properties/AssemblyInfo.cs                |   52 +-
 .../Views/HomeView.xaml                       |  230 +--
 .../Views/HomeView.xaml.cs                    |   39 +-
 .../Views/NavigationView.xaml                 |   26 +-
 .../Views/NavigationView.xaml.cs              |   46 +-
 .../Samples.Modules.Color/ColorModule.cs      |   49 +-
 .../Properties/AssemblyInfo.cs                |   52 +-
 .../Samples.Modules.Color/Views/HomeView.xaml |   75 +-
 .../Views/HomeView.xaml.cs                    |  328 +++--
 .../Views/NavigationView.xaml                 |   26 +-
 .../Views/NavigationView.xaml.cs              |   46 +-
 .../DateTimeModule.cs                         |   49 +-
 .../Properties/AssemblyInfo.cs                |   52 +-
 .../Views/HomeView.xaml                       |   26 +-
 .../Views/HomeView.xaml.cs                    |   39 +-
 .../Views/NavigationView.xaml                 |   30 +-
 .../Views/NavigationView.xaml.cs              |   46 +-
 .../Samples.Modules.Numeric/NumericModule.cs  |   49 +-
 .../Properties/AssemblyInfo.cs                |   52 +-
 .../Views/HomeView.xaml                       |   26 +-
 .../Views/HomeView.xaml.cs                    |   39 +-
 .../Views/NavigationView.xaml                 |   30 +-
 .../Views/NavigationView.xaml.cs              |   46 +-
 .../Properties/AssemblyInfo.cs                |   52 +-
 .../PropertyGridModule.cs                     |   61 +-
 .../Resources/LastNameUserControlEditor.xaml  |   28 +-
 .../LastNameUserControlEditor.xaml.cs         |   86 +-
 .../Views/BindingToStructs.xaml               |  104 +-
 .../Views/BindingToStructs.xaml.cs            |  170 ++-
 .../Views/CustomEditors.xaml                  |  145 +-
 .../Views/CustomEditors.xaml.cs               |  372 +++--
 .../Views/CustomItemsSource.xaml              |   60 +-
 .../Views/CustomItemsSource.xaml.cs           |  186 ++-
 .../Views/DefaultEditors.xaml                 |   54 +-
 .../Views/DefaultEditors.xaml.cs              |  260 ++--
 .../Views/ExpandableProperties.xaml           |   60 +-
 .../Views/ExpandableProperties.xaml.cs        |  141 +-
 .../Views/HomeView.xaml                       |  129 +-
 .../Views/HomeView.xaml.cs                    |   38 +-
 .../Views/NavigationView.xaml                 |   52 +-
 .../Views/NavigationView.xaml.cs              |   46 +-
 .../Views/SpecifyingProperties.xaml           |   76 +-
 .../Views/SpecifyingProperties.xaml.cs        |  264 ++--
 .../Properties/AssemblyInfo.cs                |   52 +-
 .../Samples.Modules.Text/TextModule.cs        |   51 +-
 .../Samples.Modules.Text/Views/HomeView.xaml  |   35 +-
 .../Views/HomeView.xaml.cs                    |   96 +-
 .../Views/NavigationView.xaml                 |   40 +-
 .../Views/NavigationView.xaml.cs              |   46 +-
 .../Views/WatermarkTextBoxView.xaml           |  102 +-
 .../Views/WatermarkTextBoxView.xaml.cs        |   39 +-
 .../Properties/AssemblyInfo.cs                |   52 +-
 .../Views/HomeView.xaml                       |   50 +-
 .../Views/HomeView.xaml.cs                    |   39 +-
 .../Views/NavigationView.xaml                 |   30 +-
 .../Views/NavigationView.xaml.cs              |   46 +-
 .../Samples.Modules.Wizard/WizardModule.cs    |   51 +-
 .../Commands/TreeViewCommandBehavior.cs       |   56 +-
 .../Commands/TreeViewSelected.cs              |  117 +-
 .../Controls/DemoView.cs                      |  256 ++--
 .../Converters/CSharpColorConverter.cs        |   83 +-
 .../Converters/XamlColorConverter.cs          |  240 +--
 .../Core/CodeFormatting/CSharpFormat.cs       |  682 +++++----
 .../Core/CodeFormatting/XamlFormat.cs         |  663 +++++----
 .../Extensions/UnityContainerExtensions.cs    |   30 +-
 .../Samples.Infrastructure/ModuleBase.cs      |   69 +-
 .../Properties/AssemblyInfo.cs                |   52 +-
 .../Samples.Infrastructure/RegionNames.cs     |   29 +-
 .../Themes/Generic.xaml                       |  313 ++--
 .../Samples.Infrastructure/ViewModelBase.cs   |   37 +-
 .../Src/Samples/Samples/App.xaml              |   40 +-
 .../Src/Samples/Samples/App.xaml.cs           |   57 +-
 .../Src/Samples/Samples/Bootstrapper.cs       |   61 +-
 .../Src/Samples/Samples/IShellViewModel.cs    |   25 +-
 .../Samples/Properties/AssemblyInfo.cs        |   52 +-
 .../Samples/Resources/TextBlockStyles.xaml    |   32 +-
 .../Samples/Resources/TreeViewStyles.xaml     |  462 +++---
 .../Src/Samples/Samples/Shell.xaml            |   92 +-
 .../Src/Samples/Samples/Shell.xaml.cs         |   63 +-
 .../Src/Samples/Samples/ShellViewModel.cs     |   50 +-
 .../Implementation/BusyIndicator.cs           |  482 +++---
 .../VisualStates.BusyIndicator.cs             |   83 +-
 .../BusyIndicator/Themes/Generic.xaml         |  292 ++--
 .../Implementation/ButtonSpinner.cs           |  405 ++---
 .../Implementation/SpinDirection.cs           |   47 +-
 .../Implementation/SpinEventArgs.cs           |   59 +-
 .../ButtonSpinner/Implementation/Spinner.cs   |  142 +-
 .../Implementation/ValidSpinDirections.cs     |   58 +-
 .../ButtonSpinner/Themes/Generic.xaml         |  147 +-
 .../Calculator/Implementation/Calculator.cs   |  882 +++++------
 .../Implementation/CalculatorCommands.cs      |   34 +-
 .../Calculator/Themes/Generic.xaml            |  996 +++++++------
 .../Implementation/CalculatorUpDown.cs        |  298 ++--
 .../CalculatorUpDown/Themes/Generic.xaml      |  263 ++--
 .../Implementation/CheckComboBox.cs           |  194 +--
 .../CheckComboBox/Themes/Generic.xaml         |  178 ++-
 .../Implementation/CheckListBox.cs            |   44 +-
 .../CheckListBox/Themes/Generic.xaml          |   58 +-
 .../ChildWindow/Implementation/ChildWindow.cs | 1305 +++++++++--------
 .../Implementation/WindowStartupLocation.cs   |   29 +-
 .../ChildWindow/Implementation/WindowState.cs |   29 +-
 .../ChildWindow/Themes/Generic.xaml           |  432 +++---
 .../Chromes/Implementation/ButtonChrome.cs    |  468 +++---
 .../Chromes/Themes/Generic.xaml               |  430 +++---
 .../Implementation/CollectionEditor.cs        |  496 ++++---
 .../CollectionEditorDialog.xaml               |   61 +-
 .../CollectionEditorDialog.xaml.cs            |  146 +-
 .../PrimitiveTypeCollectionEditor.cs          |  392 ++---
 .../CollectionEditors/Themes/Generic.xaml     |  266 ++--
 .../ColorCanvas/Implementation/ColorCanvas.cs |  643 ++++----
 .../Implementation/ColorSpectrumSlider.cs     |  134 +-
 .../ColorCanvas/Themes/Generic.xaml           |  731 ++++-----
 .../ColorPicker/Implementation/ColorItem.cs   |   45 +-
 .../ColorPicker/Implementation/ColorPicker.cs |  636 ++++----
 .../ColorPicker/Themes/Generic.xaml           |  572 ++++----
 .../CalculatorMemoryToVisibilityConverter.cs  |   42 +-
 .../ColorToSolidColorBrushConverter.cs        |  102 +-
 .../Core/Converters/InverseBoolConverter.cs   |   46 +-
 .../Converters/ObjectTypeToNameConverter.cs   |   36 +-
 .../SolidColorBrushToColorConverter.cs        |   62 +-
 .../TimeFormatToDateTimeFormatConverter.cs    |   70 +-
 .../WizardPageButtonVisibilityConverter.cs    |   84 +-
 .../Core/Primitives/HsvColor.cs               |   41 +-
 .../Core/Primitives/InputBase.cs              |  202 ++-
 .../Core/Primitives/Selector.cs               |  654 +++++----
 .../Core/Primitives/SelectorItem.cs           |  135 +-
 .../Core/Primitives/UpDownBase.cs             |  555 +++----
 .../Core/Themes/ResourceKeys.cs               |   75 +-
 .../Core/Themes/StaticResourceKey.cs          |   67 +-
 .../Core/UIElementAdorner.cs                  |  367 ++---
 .../Core/Utilities/CalculatorUtilities.cs     |  477 +++---
 .../Core/Utilities/ColorUtilities.cs          |  319 ++--
 .../Core/Utilities/ContextMenuUtilities.cs    |   69 +-
 .../Implementation/DateTimePicker.cs          |  318 ++--
 .../DateTimePicker/Themes/Generic.xaml        |  274 ++--
 .../Implementation/DateTimeFormat.cs          |   47 +-
 .../Implementation/DateTimeInfo.cs            |   57 +-
 .../Implementation/DateTimeParser.cs          |  216 +--
 .../Implementation/DateTimePart.cs            |   53 +-
 .../Implementation/DateTimeUpDown.cs          | 1080 ++++++++------
 .../DateTimeUpDown/Themes/Generic.xaml        |  118 +-
 .../Implementation/DropDownButton.cs          |  643 ++++----
 .../DropDownButton/Themes/Generic.xaml        |  163 +-
 ...rderThicknessToStrokeThicknessConverter.cs |   50 +-
 .../Converters/RadiusConverter.cs             |   44 +-
 .../Magnifier/Implementation/FrameType.cs     |   29 +-
 .../Magnifier/Implementation/Magnifier.cs     |  386 ++---
 .../Implementation/MagnifierAdorner.cs        |  156 +-
 .../Implementation/MagnifierManager.cs        |  156 +-
 .../Magnifier/Themes/Generic.xaml             |  133 +-
 .../Implementation/MaskedTextBox.cs           |  892 +++++------
 .../MessageBox/Implementation/MessageBox.cs   | 1064 ++++++++------
 .../Implementation/VisualStates.MessageBox.cs |   35 +-
 .../MessageBox/Themes/Generic.xaml            |  566 +++----
 .../Implementation/MultiLineTextEditor.cs     |  376 +++--
 .../MultiLineTextEditor/Themes/Generic.xaml   |  258 ++--
 .../Implementation/DecimalUpDown.cs           |  208 +--
 .../Implementation/DoubleUpDown.cs            |  208 +--
 .../Implementation/IntegerUpDown.cs           |  210 +--
 .../Implementation/NumericUpDown.cs           |  275 ++--
 .../NumericUpDown/Themes/Generic.xaml         |  180 ++-
 .../Properties/AssemblyInfo.cs                |   62 +-
 .../Attributes/ExpandableObjectAttribute.cs   |   29 +-
 .../Implementation/Attributes/IItemsSource.cs |   71 +-
 .../Attributes/ItemsSourceAttribute.cs        |   42 +-
 .../Attributes/PropertyOrderAttribute.cs      |   40 +-
 .../Commands/PropertyGridCommands.cs          |   37 +-
 .../Commands/PropertyItemCommands.cs          |   37 +-
 .../ExpandableObjectMarginConverter.cs        |   40 +-
 .../ValueSourceToImagePathConverter.cs        |   96 +-
 .../ValueSourceToToolTipConverter.cs          |   86 +-
 .../Implementation/EditorDefinition.cs        |   52 +-
 .../EditorDefinitionCollection.cs             |   68 +-
 .../Implementation/Editors/CheckBoxEditor.cs  |   40 +-
 .../Editors/CollectionEditor.xaml             |  117 +-
 .../Editors/CollectionEditor.xaml.cs          |   71 +-
 .../Implementation/Editors/ColorEditor.cs     |   39 +-
 .../Implementation/Editors/ComboBoxEditor.cs  |   57 +-
 .../Editors/DateTimeUpDownEditor.cs           |   37 +-
 .../Editors/DecimalUpDownEditor.cs            |   39 +-
 .../Editors/DoubleUpDownEditor.cs             |   39 +-
 .../Editors/EnumComboBoxEditor.cs             |   71 +-
 .../Editors/FontComboBoxEditor.cs             |   80 +-
 .../Implementation/Editors/ITypeEditor.cs     |   28 +-
 .../Editors/IntegerUpDownEditor.cs            |   37 +-
 .../Editors/ItemsSourceAttributeEditor.cs     |   90 +-
 .../Editors/PrimitiveTypeCollectionEditor.cs  |   55 +-
 .../Implementation/Editors/TextBlockEditor.cs |   39 +-
 .../Implementation/Editors/TextBoxEditor.cs   |   39 +-
 .../Implementation/Editors/TimeSpanEditor.cs  |   68 +-
 .../Implementation/Editors/TypeEditor.cs      |  104 +-
 .../Implementation/PropertyDefinition.cs      |   27 +-
 .../PropertyDefinitionCollection.cs           |   44 +-
 .../Implementation/PropertyGrid.cs            |  946 +++++++-----
 .../Implementation/PropertyGridUtilities.cs   |  333 +++--
 .../Implementation/PropertyItem.cs            |  747 ++++++----
 .../Implementation/PropertyItemCollection.cs  |  105 +-
 .../PropertyGrid/Themes/Generic.xaml          | 1013 ++++++-------
 .../RichTextBox/Formatters/ITextFormatter.cs  |   29 +-
 .../Formatters/PlainTextFormatter.cs          |   45 +-
 .../RichTextBox/Formatters/RtfFormatter.cs    |   92 +-
 .../RichTextBox/Formatters/XamlFormatter.cs   |   92 +-
 .../RichTextBox/RichTextBox.cs                |  238 +--
 .../IRichTextBoxFormatBar.cs                  |   33 +-
 .../RichTextBoxFormatBar.xaml                 |  882 +++++------
 .../RichTextBoxFormatBar.xaml.cs              |  375 ++---
 .../RichTextBoxFormatBarManager.cs            |  365 ++---
 .../SplitButton/Implementation/SplitButton.cs |   51 +-
 .../SplitButton/Themes/Generic.xaml           |  212 +--
 .../Themes/Aero.NormalColor.xaml              |   28 +-
 .../Themes/Aero/Brushes_NormalColor.xaml      |  234 +--
 .../Themes/Aero/Buttons_NormalColor.xaml      |   72 +-
 .../WPFToolkit.Extended/Themes/Generic.xaml   |   84 +-
 .../Themes/Generic/Brushes.xaml               |  225 +--
 .../Themes/Generic/Buttons.xaml               |   68 +-
 .../Themes/Generic/Common.xaml                |  270 ++--
 .../Themes/Generic/Glyphs.xaml                |   98 +-
 .../TimePicker/Implementation/TimeFormat.cs   |   32 +-
 .../TimePicker/Implementation/TimeItem.cs     |   82 +-
 .../TimePicker/Implementation/TimePicker.cs   |  743 +++++-----
 .../TimePicker/Themes/Generic.xaml            |  281 ++--
 .../TokenizedTextBox/Implementation/Token.cs  |   63 +-
 .../Implementation/TokenItem.cs               |   50 +-
 .../Implementation/TokenizedTextBox.cs        |  579 ++++----
 .../TokenizedTextBoxCommands.cs               |   35 +-
 .../TokenizedTextBox/Themes/Generic.xaml      |  121 +-
 .../Src/WPFToolkit.Extended/VisualStates.cs   |   25 +-
 .../Implementation/WatermarkTextBox.cs        |  141 +-
 .../WatermarkTextBox/Themes/Generic.xaml      |  178 +--
 .../Wizard/Implementation/Wizard.cs           |  852 ++++++-----
 .../Wizard/Implementation/WizardCommands.cs   |  109 +-
 .../Wizard/Implementation/WizardPage.cs       |  427 ++++--
 .../WizardPageButtonVisibility.cs             |   33 +-
 .../Wizard/Implementation/WizardPageType.cs   |   31 +-
 .../Wizard/Themes/Generic.xaml                |  364 ++---
 .../Src/WPFToolkit.Extended.Examples/App.xaml |   26 +-
 .../WPFToolkit.Extended.Examples/App.xaml.cs  |   35 +-
 .../Properties/AssemblyInfo.cs                |   52 +-
 .../WPFToolkit.Extended.Examples/Window1.xaml |   30 +-
 .../Window1.xaml.cs                           |   54 +-
 .../BusyIndicator/Themes/Generic.xaml         |  292 ++--
 .../ButtonSpinner/Themes/Generic.xaml         |  147 +-
 .../Calculator/Themes/Generic.xaml            |  996 +++++++------
 .../CalculatorUpDown/Themes/Generic.xaml      |  264 ++--
 .../CheckComboBox/Themes/Generic.xaml         |  174 ++-
 .../CheckListBox/Themes/Generic.xaml          |   56 +-
 .../ChildWindow/Themes/Generic.xaml           |  432 +++---
 .../Chromes/Themes/Generic.xaml               |   30 +-
 .../CollectionEditors/Themes/Generic.xaml     |  266 ++--
 .../ColorCanvas/Themes/Generic.xaml           |  731 ++++-----
 .../ColorPicker/Themes/Generic.xaml           |  572 ++++----
 .../DateTimePicker/Themes/Generic.xaml        |  270 ++--
 .../DateTimeUpDown/Themes/Generic.xaml        |  117 +-
 .../DropDownButton/Themes/Generic.xaml        |  163 +-
 .../Magnifier/Themes/Generic.xaml             |   43 +-
 .../MessageBox/Themes/Generic.xaml            |  566 +++----
 .../MultiLineTextEditor/Themes/Generic.xaml   |  258 ++--
 .../NumericUpDown/Themes/Generic.xaml         |  178 ++-
 .../Properties/AssemblyInfo.cs                |   64 +-
 .../PropertyGrid/Themes/Generic.xaml          | 1013 ++++++-------
 .../SplitButton/Themes/Generic.xaml           |  210 +--
 .../Themes/Aero.NormalColor.xaml              |   28 +-
 .../Themes/Aero/Brushes_NormalColor.xaml      |  234 +--
 .../Themes/Aero/Buttons_NormalColor.xaml      |   72 +-
 .../WPFToolkit.Extended/Themes/Generic.xaml   |   86 +-
 .../Themes/Generic/Brushes.xaml               |  225 +--
 .../Themes/Generic/Buttons.xaml               |   68 +-
 .../Themes/Generic/Common.xaml                |  270 ++--
 .../Themes/Generic/Glyphs.xaml                |   98 +-
 .../TimePicker/Themes/Generic.xaml            |  281 ++--
 .../TokenizedTextBox/Themes/Generic.xaml      |  121 +-
 .../WatermarkTextBox/Themes/Generic.xaml      |  182 +--
 .../Wizard/Themes/Generic.xaml                |  364 ++---
 309 files changed, 31481 insertions(+), 23497 deletions(-)

diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs
index f5aa895a..ecedc15e 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/BusyIndicatorModule.cs
@@ -1,30 +1,47 @@
-using System;
-using Samples.Infrastructure;
-using Microsoft.Practices.Unity;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
 using Samples.Infrastructure.Extensions;
 using Samples.Modules.BusyIndicator.NavigationItems;
 using Samples.Modules.BusyIndicator.Views;
 
 namespace Samples.Modules.BusyIndicator
 {
-    public class BusyIndicatorModule : ModuleBase
+  public class BusyIndicatorModule : ModuleBase
+  {
+    public BusyIndicatorModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void RegisterViewsAndTypes()
+    {
+      Container.RegisterNavigationType( typeof( BusyIndicatorView ) );
+      Container.RegisterNavigationType( typeof( BusyIndicatorCustomContentView ) );
+      Container.RegisterNavigationType( typeof( BusyIndicatorCustomContentTemplateView ) );
+    }
+
+    protected override void InitializeModule()
     {
-        public BusyIndicatorModule(IUnityContainer container, IRegionManager regionManager)
-            : base(container, regionManager)
-        {
-        }
-
-        protected override void RegisterViewsAndTypes()
-        {
-            Container.RegisterNavigationType(typeof(BusyIndicatorView));
-            Container.RegisterNavigationType(typeof(BusyIndicatorCustomContentView));
-            Container.RegisterNavigationType(typeof(BusyIndicatorCustomContentTemplateView));
-        }
-
-        protected override void InitializeModule()
-        {
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(BusyIndicatorNavItem));
-        }
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( BusyIndicatorNavItem ) );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml
index 14e971f5..b398bb50 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml
@@ -1,14 +1,32 @@
-<TreeViewItem x:Class="Samples.Modules.BusyIndicator.NavigationItems.BusyIndicatorNavItem"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.BusyIndicator.NavigationItems.BusyIndicatorNavItem"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:navItems="clr-namespace:Samples.Modules.BusyIndicator.NavigationItems"
               xmlns:views="clr-namespace:Samples.Modules.BusyIndicator.Views"
               Header="BusyIndicator" Tag="{x:Type views:BusyIndicatorView}">
-    <TreeViewItem.Resources>
-        <Style TargetType="navItems:BusyIndicatorNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
+   <TreeViewItem.Resources>
+      <Style TargetType="navItems:BusyIndicatorNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+   <TreeViewItem Header="Custom Content" Tag="{x:Type views:BusyIndicatorCustomContentView}" />
+   <TreeViewItem Header="Custom Content Template" Tag="{x:Type views:BusyIndicatorCustomContentTemplateView}" />
 
-    <TreeViewItem Header="Custom Content" Tag="{x:Type views:BusyIndicatorCustomContentView}" />
-    <TreeViewItem Header="Custom Content Template" Tag="{x:Type views:BusyIndicatorCustomContentTemplateView}" />
-    
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml.cs
index c81a6cfe..45f5a10f 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/NavigationItems/BusyIndicatorNavItem.xaml.cs
@@ -1,16 +1,34 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows.Controls;
 
 namespace Samples.Modules.BusyIndicator.NavigationItems
 {
-    /// <summary>
-    /// Interaction logic for BusyIndicatorNavItem.xaml
-    /// </summary>
-    public partial class BusyIndicatorNavItem : TreeViewItem
+  /// <summary>
+  /// Interaction logic for BusyIndicatorNavItem.xaml
+  /// </summary>
+  public partial class BusyIndicatorNavItem : TreeViewItem
+  {
+    public BusyIndicatorNavItem()
     {
-        public BusyIndicatorNavItem()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/AssemblyInfo.cs
index ca0c8bbf..b7824c68 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Properties/AssemblyInfo.cs
@@ -1,25 +1,41 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Samples.Modules.BusyIndicator")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Samples.Modules.BusyIndicator")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Samples.Modules.BusyIndicator" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Microsoft" )]
+[assembly: AssemblyProduct( "Samples.Modules.BusyIndicator" )]
+[assembly: AssemblyCopyright( "Copyright © Microsoft 2011" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -33,11 +49,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,5 +67,5 @@ 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Resources/Common.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Resources/Common.xaml
index bbfdaddc..3975c1b9 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Resources/Common.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Resources/Common.xaml
@@ -1,42 +1,60 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended">
 
-    <DataTemplate x:Key="SampleContent" >
-        <Grid Margin="10" >
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-            </Grid.RowDefinitions>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto"/>
-                <ColumnDefinition Width="*"/>
-            </Grid.ColumnDefinitions>
-
-            <TextBlock Grid.Row="0" Text="First Name:" Margin="2" VerticalAlignment="Center" />
-            <extToolkit:WatermarkTextBox Grid.Row="0" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter First Name"  />
-
-            <TextBlock Grid.Row="1" Text="Last Name:" Margin="2" VerticalAlignment="Center" />
-            <extToolkit:WatermarkTextBox Grid.Row="1" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter Last Name"  />
-
-            <TextBlock Grid.Row="2" Text="Date of Birth:" Margin="2" VerticalAlignment="Center" />
-            <extToolkit:DateTimeUpDown Grid.Row="2" Grid.Column="1" Format="ShortDate" Margin="2" VerticalAlignment="Center" Watermark="Enter Date of Birth" />
-
-            <TextBlock Grid.Row="3" Text="Salary:" Margin="2" VerticalAlignment="Center" />
-            <extToolkit:IntegerUpDown Grid.Row="3" Grid.Column="1" FormatString="C2" Margin="2" VerticalAlignment="Center" Watermark="Enter Salary"  />
-
-            <TextBlock Grid.Row="4" Text="Favorite Color:" Margin="2" VerticalAlignment="Center" />
-            <extToolkit:ColorPicker Grid.Row="4" Grid.Column="1" Margin="2" VerticalAlignment="Center" />
-
-            <StackPanel Grid.Row="5" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
-                <Button Width="65" Margin="2">OK</Button>
-                <Button Width="65" Margin="2">Cancel</Button>
-            </StackPanel>
-        </Grid>
-    </DataTemplate>
+   <DataTemplate x:Key="SampleContent">
+      <Grid Margin="10">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+         </Grid.RowDefinitions>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+
+         <TextBlock Grid.Row="0" Text="First Name:" Margin="2" VerticalAlignment="Center" />
+         <extToolkit:WatermarkTextBox Grid.Row="0" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter First Name" />
+
+         <TextBlock Grid.Row="1" Text="Last Name:" Margin="2" VerticalAlignment="Center" />
+         <extToolkit:WatermarkTextBox Grid.Row="1" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter Last Name" />
+
+         <TextBlock Grid.Row="2" Text="Date of Birth:" Margin="2" VerticalAlignment="Center" />
+         <extToolkit:DateTimeUpDown Grid.Row="2" Grid.Column="1" Format="ShortDate" Margin="2" VerticalAlignment="Center" Watermark="Enter Date of Birth" />
+
+         <TextBlock Grid.Row="3" Text="Salary:" Margin="2" VerticalAlignment="Center" />
+         <extToolkit:IntegerUpDown Grid.Row="3" Grid.Column="1" FormatString="C2" Margin="2" VerticalAlignment="Center" Watermark="Enter Salary" />
+
+         <TextBlock Grid.Row="4" Text="Favorite Color:" Margin="2" VerticalAlignment="Center" />
+         <extToolkit:ColorPicker Grid.Row="4" Grid.Column="1" Margin="2" VerticalAlignment="Center" />
+
+         <StackPanel Grid.Row="5" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
+            <Button Width="65" Margin="2">OK</Button>
+            <Button Width="65" Margin="2">Cancel</Button>
+         </StackPanel>
+      </Grid>
+   </DataTemplate>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml
index f283593e..696b79e0 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml
@@ -1,63 +1,81 @@
-<infControls:DemoView x:Class="Samples.Modules.BusyIndicator.Views.BusyIndicatorCustomContentTemplateView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.BusyIndicator.Views.BusyIndicatorCustomContentTemplateView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="BusyIndicator">
-    <infControls:DemoView.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Samples.Modules.Busyindicator;component/Resources/Common.xaml"  />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </infControls:DemoView.Resources>
-
-    <Grid>
-
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="This example demonstrates how to create a custom content template by setting the BusyContentTemplate property to an instance of a custom DataTemplate. Take notice of how the default ProgressBar is being hidden by setting the PrgressBarStyle property.  The default OverlayStyle is also being set to a custom style."
-                   TextWrapping="Wrap" />
-
-        <StackPanel Grid.Row="1" Margin="10">
-            <TextBlock Grid.Row="2" Text="Custom Content Template:" Style="{StaticResource Header}" />
-            <extToolkit:BusyIndicator IsBusy="True">
-                <extToolkit:BusyIndicator.BusyContentTemplate>
-                    <DataTemplate>
-                        <StackPanel Margin="4">
-                            <TextBlock Text="Downloading Email" FontWeight="Bold" HorizontalAlignment="Center"/>
-                            <StackPanel Margin="4">
-                                <TextBlock Text="Downloading message 4/10..."/>
-                                <ProgressBar Value="40" Height="15"/>
-                            </StackPanel>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition/>
-                                    <ColumnDefinition/>
-                                </Grid.ColumnDefinitions>
-                                <Button Grid.Column="0" Content="Pause" HorizontalAlignment="Right" Margin="0 0 2 0"/>
-                                <Button Grid.Column="1" Content="Cancel" HorizontalAlignment="Left" Margin="2 0 0 0"/>
-                            </Grid>
-                        </StackPanel>
-                    </DataTemplate>
-                </extToolkit:BusyIndicator.BusyContentTemplate>
-                <extToolkit:BusyIndicator.OverlayStyle>
-                    <Style TargetType="Rectangle">
-                        <Setter Property="Fill" Value="#B1EB1D1D"/>
-                    </Style>
-                </extToolkit:BusyIndicator.OverlayStyle>
-                <extToolkit:BusyIndicator.ProgressBarStyle>
-                    <Style TargetType="ProgressBar">
-                        <Setter Property="Visibility" Value="Collapsed"/>
-                    </Style>
-                </extToolkit:BusyIndicator.ProgressBarStyle>
-
-                <ContentControl ContentTemplate="{StaticResource SampleContent}" />
-            </extToolkit:BusyIndicator>
-        </StackPanel>
-    </Grid>
+   <infControls:DemoView.Resources>
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="/Samples.Modules.Busyindicator;component/Resources/Common.xaml" />
+         </ResourceDictionary.MergedDictionaries>
+      </ResourceDictionary>
+   </infControls:DemoView.Resources>
+
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="This example demonstrates how to create a custom content template by setting the BusyContentTemplate property to an instance of a custom DataTemplate. Take notice of how the default ProgressBar is being hidden by setting the PrgressBarStyle property.  The default OverlayStyle is also being set to a custom style."
+                 TextWrapping="Wrap" />
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Grid.Row="2" Text="Custom Content Template:" Style="{StaticResource Header}" />
+         <extToolkit:BusyIndicator IsBusy="True">
+            <extToolkit:BusyIndicator.BusyContentTemplate>
+               <DataTemplate>
+                  <StackPanel Margin="4">
+                     <TextBlock Text="Downloading Email" FontWeight="Bold" HorizontalAlignment="Center" />
+                     <StackPanel Margin="4">
+                        <TextBlock Text="Downloading message 4/10..." />
+                        <ProgressBar Value="40" Height="15" />
+                     </StackPanel>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition/>
+                           <ColumnDefinition/>
+                        </Grid.ColumnDefinitions>
+                        <Button Grid.Column="0" Content="Pause" HorizontalAlignment="Right" Margin="0 0 2 0" />
+                        <Button Grid.Column="1" Content="Cancel" HorizontalAlignment="Left" Margin="2 0 0 0" />
+                     </Grid>
+                  </StackPanel>
+               </DataTemplate>
+            </extToolkit:BusyIndicator.BusyContentTemplate>
+            <extToolkit:BusyIndicator.OverlayStyle>
+               <Style TargetType="Rectangle">
+                  <Setter Property="Fill" Value="#B1EB1D1D" />
+               </Style>
+            </extToolkit:BusyIndicator.OverlayStyle>
+            <extToolkit:BusyIndicator.ProgressBarStyle>
+               <Style TargetType="ProgressBar">
+                  <Setter Property="Visibility" Value="Collapsed" />
+               </Style>
+            </extToolkit:BusyIndicator.ProgressBarStyle>
+
+            <ContentControl ContentTemplate="{StaticResource SampleContent}" />
+         </extToolkit:BusyIndicator>
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
 
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs
index ddd46af9..372ddbc5 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentTemplateView.xaml.cs
@@ -1,18 +1,35 @@
-using System;
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.BusyIndicator.Views
 {
-    /// <summary>
-    /// Interaction logic for BusyIndicatorCustomContentTemplateView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive=false)]
-    public partial class BusyIndicatorCustomContentTemplateView : DemoView
+  /// <summary>
+  /// Interaction logic for BusyIndicatorCustomContentTemplateView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class BusyIndicatorCustomContentTemplateView : DemoView
+  {
+    public BusyIndicatorCustomContentTemplateView()
     {
-        public BusyIndicatorCustomContentTemplateView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml
index 7c936ba1..fc9dbf29 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml
@@ -1,41 +1,59 @@
-<infControls:DemoView x:Class="Samples.Modules.BusyIndicator.Views.BusyIndicatorCustomContentView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.BusyIndicator.Views.BusyIndicatorCustomContentView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="BusyIndicator">
-    <infControls:DemoView.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Samples.Modules.Busyindicator;component/Resources/Common.xaml"  />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-    </infControls:DemoView.Resources>
-
-    <Grid>
-
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="This example demonstrates how to define your own custom content. This is done by setting the BusyContent property."
-                   TextWrapping="Wrap" />
-
-        <StackPanel Grid.Row="1" Margin="10">
-            <TextBlock Text="Custom Content:" Style="{StaticResource Header}" />
-            <extToolkit:BusyIndicator IsBusy="True">
-                <extToolkit:BusyIndicator.BusyContent>
-                    <StackPanel Orientation="Horizontal" >
-                        <Image Source="/Samples.Modules.BusyIndicator;component/Images/CdBurning32.png" />
-                        <StackPanel Margin="5,0">
-                            <TextBlock Text="Burning CD..." VerticalAlignment="Center"  />
-                            <TextBlock Text="Madonna - Like a Virgin" VerticalAlignment="Center" Margin="8,0"  />
-                        </StackPanel>
-                    </StackPanel>
-                </extToolkit:BusyIndicator.BusyContent>
-                <ContentControl ContentTemplate="{StaticResource SampleContent}" />
-            </extToolkit:BusyIndicator>
-        </StackPanel>
-    </Grid>
+   <infControls:DemoView.Resources>
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="/Samples.Modules.Busyindicator;component/Resources/Common.xaml" />
+         </ResourceDictionary.MergedDictionaries>
+      </ResourceDictionary>
+   </infControls:DemoView.Resources>
+
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="This example demonstrates how to define your own custom content. This is done by setting the BusyContent property."
+                 TextWrapping="Wrap" />
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Custom Content:" Style="{StaticResource Header}" />
+         <extToolkit:BusyIndicator IsBusy="True">
+            <extToolkit:BusyIndicator.BusyContent>
+               <StackPanel Orientation="Horizontal">
+                  <Image Source="/Samples.Modules.BusyIndicator;component/Images/CdBurning32.png" />
+                  <StackPanel Margin="5,0">
+                     <TextBlock Text="Burning CD..." VerticalAlignment="Center" />
+                     <TextBlock Text="Madonna - Like a Virgin" VerticalAlignment="Center" Margin="8,0" />
+                  </StackPanel>
+               </StackPanel>
+            </extToolkit:BusyIndicator.BusyContent>
+            <ContentControl ContentTemplate="{StaticResource SampleContent}" />
+         </extToolkit:BusyIndicator>
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs
index 36ce6ab3..fc8d3440 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorCustomContentView.xaml.cs
@@ -1,18 +1,35 @@
-using System;
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.BusyIndicator.Views
 {
-    /// <summary>
-    /// Interaction logic for BusyIndicatorCustomContentView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive=false)]
-    public partial class BusyIndicatorCustomContentView : DemoView
+  /// <summary>
+  /// Interaction logic for BusyIndicatorCustomContentView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class BusyIndicatorCustomContentView : DemoView
+  {
+    public BusyIndicatorCustomContentView()
     {
-        public BusyIndicatorCustomContentView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml
index 44910071..3a2f51d2 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml
@@ -1,4 +1,22 @@
-<infControls:DemoView x:Class="Samples.Modules.BusyIndicator.Views.BusyIndicatorView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.BusyIndicator.Views.BusyIndicatorView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:local="clr-namespace:Samples.Modules.BusyIndicator.Views"
@@ -6,54 +24,54 @@
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="BusyIndicator">
 
-    <infControls:DemoView.Resources>
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Samples.Modules.Busyindicator;component/Resources/Common.xaml"  />
-            </ResourceDictionary.MergedDictionaries>            
-            <local:IntegerToTimespanConverter x:Key="TimeSpanConverter" />            
-        </ResourceDictionary>
-    </infControls:DemoView.Resources>
-
-    <Grid>
-
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-
-        <TextBlock Text="BusyIndicator makes it easy to let the user know when an application is busy. Simply wrap the relevant content in an instance of the BusyIndicator control and toggle its IsBusy property to True during any long-running process."
-                   TextWrapping="Wrap" />
-
-        <GroupBox Header="Features" Grid.Row="1" Margin="5"  >
-            <Grid Margin="5">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <TextBlock Text="IsBusy:" VerticalAlignment="Center" Margin="2"/>
-                <CheckBox x:Name="_isBusy" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="When true shows the BusyIndicator" />
-
-                <TextBlock Text="DisplayAfter:" Grid.Row="1" VerticalAlignment="Center" Margin="2"/>
-                <StackPanel Grid.Row="1" Grid.Column="1" Margin="5" HorizontalAlignment="Left" Orientation="Horizontal">
-                    <extToolkit:IntegerUpDown x:Name="_displayAfter" Width="65" VerticalAlignment="Center" Minimum="0" Increment="100" Value="0" ToolTip="Sets the TimeSpan to wait until the BusyIndicator is displayed."  />
-                    <TextBlock Text="milliseconds" Margin="5,0"  VerticalAlignment="Center"/>
-                </StackPanel>
-            </Grid>
-        </GroupBox>
-
-        <StackPanel Grid.Row="2" Margin="10">
-            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-            <extToolkit:BusyIndicator IsBusy="{Binding IsChecked, ElementName=_isBusy}" DisplayAfter="{Binding Value, ElementName=_displayAfter, Converter={StaticResource TimeSpanConverter}}" >
-                <ContentControl ContentTemplate="{StaticResource SampleContent}" />
-            </extToolkit:BusyIndicator>
-        </StackPanel>
-    </Grid>
+   <infControls:DemoView.Resources>
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="/Samples.Modules.Busyindicator;component/Resources/Common.xaml" />
+         </ResourceDictionary.MergedDictionaries>
+         <local:IntegerToTimespanConverter x:Key="TimeSpanConverter" />
+      </ResourceDictionary>
+   </infControls:DemoView.Resources>
+
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+
+      <TextBlock Text="BusyIndicator makes it easy to let the user know when an application is busy. Simply wrap the relevant content in an instance of the BusyIndicator control and toggle its IsBusy property to True during any long-running process."
+                 TextWrapping="Wrap" />
+
+      <GroupBox Header="Features" Grid.Row="1" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="IsBusy:" VerticalAlignment="Center" Margin="2" />
+            <CheckBox x:Name="_isBusy" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="When true shows the BusyIndicator" />
+
+            <TextBlock Text="DisplayAfter:" Grid.Row="1" VerticalAlignment="Center" Margin="2" />
+            <StackPanel Grid.Row="1" Grid.Column="1" Margin="5" HorizontalAlignment="Left" Orientation="Horizontal">
+               <extToolkit:IntegerUpDown x:Name="_displayAfter" Width="65" VerticalAlignment="Center" Minimum="0" Increment="100" Value="0" ToolTip="Sets the TimeSpan to wait until the BusyIndicator is displayed." />
+               <TextBlock Text="milliseconds" Margin="5,0"  VerticalAlignment="Center" />
+            </StackPanel>
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="2" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <extToolkit:BusyIndicator IsBusy="{Binding IsChecked, ElementName=_isBusy}" DisplayAfter="{Binding Value, ElementName=_displayAfter, Converter={StaticResource TimeSpanConverter}}">
+            <ContentControl ContentTemplate="{StaticResource SampleContent}" />
+         </extToolkit:BusyIndicator>
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml.cs
index eea3cb14..60430d3a 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.BusyIndicator/Views/BusyIndicatorView.xaml.cs
@@ -1,32 +1,50 @@
-using System;
-using Samples.Infrastructure.Controls;
-using Microsoft.Practices.Prism.Regions;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows.Data;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.BusyIndicator.Views
 {
-    /// <summary>
-    /// Interaction logic for HomeView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive=false)]
-    public partial class BusyIndicatorView : DemoView
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class BusyIndicatorView : DemoView
+  {
+    public BusyIndicatorView()
+    {
+      InitializeComponent();
+    }
+  }
+
+  public class IntegerToTimespanConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
-        public BusyIndicatorView()
-        {
-            InitializeComponent();
-        }
+      return TimeSpan.FromMilliseconds( ( int )value );
     }
 
-    public class IntegerToTimespanConverter : IValueConverter
+    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)
-        {
-            return TimeSpan.FromMilliseconds((int)value);
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+      throw new NotImplementedException();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs
index 66526652..bbce34c8 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/ButtonModule.cs
@@ -1,30 +1,49 @@
-using System;
-using Samples.Infrastructure;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
 using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
 using Samples.Infrastructure.Extensions;
-using Samples.Modules.Button.Views;
 using Samples.Modules.Button.NavigationItems;
+using Samples.Modules.Button.Views;
 
 namespace Samples.Modules.Button
 {
-    public class ButtonModule : ModuleBase
+  public class ButtonModule : ModuleBase
+  {
+    public ButtonModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( ButtonSpinnerNavItem ) );
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( DropDownButtonNavItem ) );
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( SplitButtonNavItem ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
     {
-        public ButtonModule(IUnityContainer container, IRegionManager regionManager)
-            : base(container, regionManager) { }
-
-        protected override void InitializeModule()
-        {
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(ButtonSpinnerNavItem));
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(DropDownButtonNavItem));
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(SplitButtonNavItem));
-        }
-
-        protected override void RegisterViewsAndTypes()
-        {
-            Container.RegisterNavigationType(typeof(ButtonSpinnerView));
-            Container.RegisterNavigationType(typeof(DropDownButtonView));
-            Container.RegisterNavigationType(typeof(SplitButtonView));
-        }
+      Container.RegisterNavigationType( typeof( ButtonSpinnerView ) );
+      Container.RegisterNavigationType( typeof( DropDownButtonView ) );
+      Container.RegisterNavigationType( typeof( SplitButtonView ) );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml
index 229405ba..c58de485 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml
@@ -1,12 +1,30 @@
-<TreeViewItem x:Class="Samples.Modules.Button.NavigationItems.ButtonSpinnerNavItem"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Button.NavigationItems.ButtonSpinnerNavItem"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:navItems="clr-namespace:Samples.Modules.Button.NavigationItems"
               xmlns:views="clr-namespace:Samples.Modules.Button.Views" 
               Header="ButtonSpinner" Tag="{x:Type views:ButtonSpinnerView}" >
 
-    <TreeViewItem.Resources>
-        <Style TargetType="navItems:ButtonSpinnerNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
+   <TreeViewItem.Resources>
+      <Style TargetType="navItems:ButtonSpinnerNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
 
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml.cs
index bcd263cf..60c4bff7 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/ButtonSpinnerNavItem.xaml.cs
@@ -1,16 +1,33 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Controls;
 
 namespace Samples.Modules.Button.NavigationItems
 {
-    /// <summary>
-    /// Interaction logic for ButtonSpinnerNavItem.xaml
-    /// </summary>
-    public partial class ButtonSpinnerNavItem : TreeViewItem
+  /// <summary>
+  /// Interaction logic for ButtonSpinnerNavItem.xaml
+  /// </summary>
+  public partial class ButtonSpinnerNavItem : TreeViewItem
+  {
+    public ButtonSpinnerNavItem()
     {
-        public ButtonSpinnerNavItem()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml
index 64b045d5..85a0f147 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml
@@ -1,12 +1,30 @@
-<TreeViewItem x:Class="Samples.Modules.Button.NavigationItems.DropDownButtonNavItem"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Button.NavigationItems.DropDownButtonNavItem"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:navItems="clr-namespace:Samples.Modules.Button.NavigationItems"
               xmlns:views="clr-namespace:Samples.Modules.Button.Views"
               Header="DropDownButton" Tag="{x:Type views:DropDownButtonView}">
 
-    <TreeViewItem.Resources>
-        <Style TargetType="navItems:DropDownButtonNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
+   <TreeViewItem.Resources>
+      <Style TargetType="navItems:DropDownButtonNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
 
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml.cs
index 3bdcb29f..c37b8120 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/DropDownButtonNavItem.xaml.cs
@@ -1,16 +1,33 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Controls;
 
 namespace Samples.Modules.Button.NavigationItems
 {
-    /// <summary>
-    /// Interaction logic for DropDownButtonNavItem.xaml
-    /// </summary>
-    public partial class DropDownButtonNavItem : TreeViewItem
+  /// <summary>
+  /// Interaction logic for DropDownButtonNavItem.xaml
+  /// </summary>
+  public partial class DropDownButtonNavItem : TreeViewItem
+  {
+    public DropDownButtonNavItem()
     {
-        public DropDownButtonNavItem()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml
index c21a52e3..f7d968b2 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml
@@ -1,12 +1,30 @@
-<TreeViewItem x:Class="Samples.Modules.Button.NavigationItems.SplitButtonNavItem"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Button.NavigationItems.SplitButtonNavItem"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:navItems="clr-namespace:Samples.Modules.Button.NavigationItems"
               xmlns:views="clr-namespace:Samples.Modules.Button.Views"
               Header="SplitButton" Tag="{x:Type views:SplitButtonView}">
 
-    <TreeViewItem.Resources>
-        <Style TargetType="navItems:SplitButtonNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
+   <TreeViewItem.Resources>
+      <Style TargetType="navItems:SplitButtonNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
 
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml.cs
index 0313e1ca..31e231fe 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/NavigationItems/SplitButtonNavItem.xaml.cs
@@ -1,16 +1,33 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Controls;
 
 namespace Samples.Modules.Button.NavigationItems
 {
-    /// <summary>
-    /// Interaction logic for SplitButtonNavItem.xaml
-    /// </summary>
-    public partial class SplitButtonNavItem : TreeViewItem
+  /// <summary>
+  /// Interaction logic for SplitButtonNavItem.xaml
+  /// </summary>
+  public partial class SplitButtonNavItem : TreeViewItem
+  {
+    public SplitButtonNavItem()
     {
-        public SplitButtonNavItem()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/AssemblyInfo.cs
index ddb74296..d3d18189 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Properties/AssemblyInfo.cs
@@ -1,25 +1,41 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Samples.Modules.Button")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Samples.Modules.Button")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Samples.Modules.Button" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Microsoft" )]
+[assembly: AssemblyProduct( "Samples.Modules.Button" )]
+[assembly: AssemblyCopyright( "Copyright © Microsoft 2011" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -33,11 +49,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,5 +67,5 @@ 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml
index fbdb3d8a..8a253d14 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml
@@ -1,49 +1,69 @@
-<infControls:DemoView x:Class="Samples.Modules.Button.Views.ButtonSpinnerView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.Button.Views.ButtonSpinnerView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="ButtonSpinner">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="The ButtonSpinner control allows you to add button spinners to any element and then respond to the Spin event to manipulate that element. The Spin event lets the developer know which direction the buttons are spinning; SpinDirection.Increase indicates an increment, SpinDirection.Decrease indicates a decrement."
-                   TextWrapping="Wrap" />
-
-        <GroupBox Header="Features" Grid.Row="1" Margin="5"  >
-            <Grid Margin="5">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <TextBlock Text="AllowSpin:" VerticalAlignment="Center" />
-                <CheckBox x:Name="_allowSpin" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="When true allows the ButtonSpinner to perform increment/decrement operations."/>
-
-                <TextBlock Text="ShowButtonSpinner:" VerticalAlignment="Center" Grid.Row="1" />
-                <CheckBox x:Name="_showButtonSpinner" Grid.Row="1" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Gets/Sets the visibility of the button spinners."/>
-            </Grid>
-        </GroupBox>
-
-        <StackPanel Grid.Row="2" Margin="10">
-            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-            <TextBlock Text="You can wrap any element by placing it inside the content area of the ButtonSpinner control. As an example, lets create our own simple numeric up/down control"
-                       TextWrapping="Wrap"/>
-
-            <extToolkit:ButtonSpinner Margin="10" Width="150" HorizontalAlignment="Left"
-                                      AllowSpin="{Binding IsChecked, ElementName=_allowSpin}"
-                                      ShowButtonSpinner="{Binding IsChecked, ElementName=_showButtonSpinner}"
-                                      Spin="ButtonSpinner_Spin" >
-                <TextBox Text="0" BorderThickness="0" HorizontalContentAlignment="Right" />
-            </extToolkit:ButtonSpinner>
-        </StackPanel>
-    </Grid>
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="The ButtonSpinner control allows you to add button spinners to any element and then respond to the Spin event to manipulate that element. The Spin event lets the developer know which direction the buttons are spinning; SpinDirection.Increase indicates an increment, SpinDirection.Decrease indicates a decrement."
+                 TextWrapping="Wrap" />
+
+      <GroupBox Header="Features" Grid.Row="1" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="AllowSpin:" VerticalAlignment="Center" />
+            <CheckBox x:Name="_allowSpin" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="When true allows the ButtonSpinner to perform increment/decrement operations." />
+
+            <TextBlock Text="ShowButtonSpinner:" VerticalAlignment="Center" Grid.Row="1" />
+            <CheckBox x:Name="_showButtonSpinner" Grid.Row="1" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Gets/Sets the visibility of the button spinners." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="2" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <TextBlock Text="You can wrap any element by placing it inside the content area of the ButtonSpinner control. As an example, lets create our own simple numeric up/down control"
+                    TextWrapping="Wrap" />
+
+         <extToolkit:ButtonSpinner Margin="10" 
+                                   Width="150" 
+                                   HorizontalAlignment="Left"
+                                   AllowSpin="{Binding IsChecked, ElementName=_allowSpin}"
+                                   ShowButtonSpinner="{Binding IsChecked, ElementName=_showButtonSpinner}"
+                                   Spin="ButtonSpinner_Spin">
+            <TextBox Text="0" BorderThickness="0" HorizontalContentAlignment="Right" />
+         </extToolkit:ButtonSpinner>
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml.cs
index 64e9bab8..62660d8e 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/ButtonSpinnerView.xaml.cs
@@ -1,40 +1,58 @@
-using System;
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
+using System.Windows.Controls;
 using Microsoft.Practices.Prism.Regions;
 using Microsoft.Windows.Controls;
-using System.Windows.Controls;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.Button.Views
 {
-    /// <summary>
-    /// Interaction logic for ButtonSpinnerView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class ButtonSpinnerView : DemoView
+  /// <summary>
+  /// Interaction logic for ButtonSpinnerView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class ButtonSpinnerView : DemoView
+  {
+    public ButtonSpinnerView()
     {
-        public ButtonSpinnerView()
-        {
-            InitializeComponent();
-        }
-
-        private void ButtonSpinner_Spin(object sender, Microsoft.Windows.Controls.SpinEventArgs e)
-        {
-            ButtonSpinner spinner = (ButtonSpinner)sender;
-            TextBox txtBox = (TextBox)spinner.Content;
-
-            try
-            {
-                int value = String.IsNullOrEmpty(txtBox.Text) ? 0 : Convert.ToInt32(txtBox.Text);
-                if (e.Direction == Microsoft.Windows.Controls.SpinDirection.Increase)
-                    value++;
-                else
-                    value--;
-                txtBox.Text = value.ToString();
-            }
-            catch
-            {
-                txtBox.Text = "0";
-            }
-        }
+      InitializeComponent();
+    }
+
+    private void ButtonSpinner_Spin( object sender, Microsoft.Windows.Controls.SpinEventArgs e )
+    {
+      ButtonSpinner spinner = ( ButtonSpinner )sender;
+      TextBox txtBox = ( TextBox )spinner.Content;
+
+      try
+      {
+        int value = String.IsNullOrEmpty( txtBox.Text ) ? 0 : Convert.ToInt32( txtBox.Text );
+        if( e.Direction == Microsoft.Windows.Controls.SpinDirection.Increase )
+          value++;
+        else
+          value--;
+        txtBox.Text = value.ToString();
+      }
+      catch
+      {
+        txtBox.Text = "0";
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml
index a6d4a614..7abad68b 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml
@@ -1,46 +1,64 @@
-<infControls:DemoView x:Class="Samples.Modules.Button.Views.DropDownButtonView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.Button.Views.DropDownButtonView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
-                      Title="DropDownButton" >    
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="The DropDownButton control is a button that when clicked displays a drop down in which you can place any custom content within."
-                   TextWrapping="Wrap" />
-
-        <GroupBox Header="Features" Grid.Row="1" 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="IsOpen: " VerticalAlignment="Center"  />
-                <CheckBox x:Name="_isOpen" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5" ClickMode="Press" ToolTip="Get/Sets a value indicating whether or not the drop down is open." />
-            </Grid>
-        </GroupBox>
-
-        <StackPanel Grid.Row="2" Margin="10">
-            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-            <extToolkit:DropDownButton x:Name="_dropDownButton" Margin="10" Width="150" HorizontalAlignment="Left" Content="Click Me" IsOpen="{Binding IsChecked, ElementName=_isOpen, Mode=TwoWay}"
-                                       Click="DropDownButton_Click">
-                <extToolkit:DropDownButton.DropDownContent>
-                    <StackPanel>
-                        <extToolkit:ColorCanvas />
-                        <Button Click="Button_Click" Margin="10">OK</Button>
-                    </StackPanel>
-                </extToolkit:DropDownButton.DropDownContent>
-            </extToolkit:DropDownButton>
-        </StackPanel>
-    </Grid>
+                      Title="DropDownButton">
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="The DropDownButton control is a button that when clicked displays a drop down in which you can place any custom content within."
+                 TextWrapping="Wrap" />
+
+      <GroupBox Header="Features" Grid.Row="1" 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="IsOpen: " VerticalAlignment="Center" />
+            <CheckBox x:Name="_isOpen" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5" ClickMode="Press" ToolTip="Get/Sets a value indicating whether or not the drop down is open." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="2" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <extToolkit:DropDownButton x:Name="_dropDownButton" Margin="10" Width="150" HorizontalAlignment="Left" Content="Click Me" IsOpen="{Binding IsChecked, ElementName=_isOpen, Mode=TwoWay}"
+                                    Click="DropDownButton_Click">
+            <extToolkit:DropDownButton.DropDownContent>
+               <StackPanel>
+                  <extToolkit:ColorCanvas />
+                  <Button Click="Button_Click" Margin="10">OK</Button>
+               </StackPanel>
+            </extToolkit:DropDownButton.DropDownContent>
+         </extToolkit:DropDownButton>
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml.cs
index 25b1067c..f5c9f38a 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/DropDownButtonView.xaml.cs
@@ -1,28 +1,45 @@
-using System;
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.Button.Views
 {
-    /// <summary>
-    /// Interaction logic for DropDownButtonView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class DropDownButtonView : DemoView
+  /// <summary>
+  /// Interaction logic for DropDownButtonView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class DropDownButtonView : DemoView
+  {
+    public DropDownButtonView()
+    {
+      InitializeComponent();
+    }
+
+    private void DropDownButton_Click( object sender, System.Windows.RoutedEventArgs e )
+    {
+
+    }
+
+    private void Button_Click( object sender, System.Windows.RoutedEventArgs e )
     {
-        public DropDownButtonView()
-        {
-            InitializeComponent();
-        }
-
-        private void DropDownButton_Click(object sender, System.Windows.RoutedEventArgs e)
-        {
-            
-        }
-
-        private void Button_Click(object sender, System.Windows.RoutedEventArgs e)
-        {
-            _dropDownButton.IsOpen = false;
-        }
+      _dropDownButton.IsOpen = false;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml
index cc98a659..e3b940f8 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml
@@ -1,47 +1,64 @@
-<infControls:DemoView x:Class="Samples.Modules.Button.Views.SplitButtonView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.Button.Views.SplitButtonView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="SplitButton">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="The SplitButton control is a button that can be clicked and also provides a drop down in which you can place any custom content within."
-                   TextWrapping="Wrap" />
-
-        <GroupBox Header="Features" Grid.Row="1" 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="IsOpen: " VerticalAlignment="Center"  />
-                <CheckBox x:Name="_isOpen" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5" ClickMode="Press" ToolTip="Get/Sets a value indicating whether or not the drop down is open."/>
-            </Grid>
-        </GroupBox>
-
-        <StackPanel Grid.Row="2" Margin="10">
-            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-            <extToolkit:SplitButton x:Name="_splitButton" Margin="10" Width="150" HorizontalAlignment="Left" Content="Click Me" IsOpen="{Binding IsChecked, ElementName=_isOpen, Mode=TwoWay}"
-                                    Click="SplitButton_Click">
-                <extToolkit:SplitButton.DropDownContent>
-                    <StackPanel>
-                        <extToolkit:ColorCanvas />
-                        <Button Click="Button_Click" Margin="10">OK</Button>
-                    </StackPanel>
-                </extToolkit:SplitButton.DropDownContent>
-            </extToolkit:SplitButton>
-            
-        </StackPanel>
-    </Grid>
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="The SplitButton control is a button that can be clicked and also provides a drop down in which you can place any custom content within."
+                 TextWrapping="Wrap" />
+
+      <GroupBox Header="Features" Grid.Row="1" 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="IsOpen: " VerticalAlignment="Center" />
+            <CheckBox x:Name="_isOpen" Grid.Column="1" IsChecked="False" VerticalAlignment="Center" Margin="5" ClickMode="Press" ToolTip="Get/Sets a value indicating whether or not the drop down is open." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="2" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <extToolkit:SplitButton x:Name="_splitButton" Margin="10" Width="150" HorizontalAlignment="Left" Content="Click Me" IsOpen="{Binding IsChecked, ElementName=_isOpen, Mode=TwoWay}"
+                                 Click="SplitButton_Click">
+            <extToolkit:SplitButton.DropDownContent>
+               <StackPanel>
+                  <extToolkit:ColorCanvas />
+                  <Button Click="Button_Click" Margin="10">OK</Button>
+               </StackPanel>
+            </extToolkit:SplitButton.DropDownContent>
+         </extToolkit:SplitButton>
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml.cs
index 6d5904fd..98c3249e 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Button/Views/SplitButtonView.xaml.cs
@@ -1,28 +1,45 @@
-using System;
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.Button.Views
 {
-    /// <summary>
-    /// Interaction logic for SplitButtonView.xaml
-    /// </summary>
-     [RegionMemberLifetime(KeepAlive = false)]
-    public partial class SplitButtonView : DemoView
+  /// <summary>
+  /// Interaction logic for SplitButtonView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class SplitButtonView : DemoView
+  {
+    public SplitButtonView()
+    {
+      InitializeComponent();
+    }
+
+    private void SplitButton_Click( object sender, System.Windows.RoutedEventArgs e )
+    {
+      Microsoft.Windows.Controls.MessageBox.Show( "Thanks for clicking me!", "SplitButton Click" );
+    }
+
+    private void Button_Click( object sender, System.Windows.RoutedEventArgs e )
     {
-        public SplitButtonView()
-        {
-            InitializeComponent();
-        }
-
-        private void SplitButton_Click(object sender, System.Windows.RoutedEventArgs e)
-        {
-            Microsoft.Windows.Controls.MessageBox.Show("Thanks for clicking me!", "SplitButton Click");
-        }
-
-        private void Button_Click(object sender, System.Windows.RoutedEventArgs e)
-        {
-            _splitButton.IsOpen = false;
-        }
+      _splitButton.IsOpen = false;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/CalculatorModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/CalculatorModule.cs
index 5e2e5e09..e25d79fc 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/CalculatorModule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/CalculatorModule.cs
@@ -1,28 +1,47 @@
-using System;
-using Samples.Infrastructure;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
 using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
 using Samples.Infrastructure.Extensions;
-using Samples.Modules.Calculator.Views;
 using Samples.Modules.Calculator.NavigationItems;
+using Samples.Modules.Calculator.Views;
 
 namespace Samples.Modules.Calculator
 {
-    public class CalculatorModule : ModuleBase
+  public class CalculatorModule : ModuleBase
+  {
+    public CalculatorModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( CalculatorNavItem ) );
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( CalculatorUpDownNavItem ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
     {
-        public CalculatorModule(IUnityContainer container, IRegionManager regionManager)
-            : base(container, regionManager) { }
-
-        protected override void InitializeModule()
-        {
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(CalculatorNavItem));
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(CalculatorUpDownNavItem));
-        }
-
-        protected override void RegisterViewsAndTypes()
-        {
-            Container.RegisterNavigationType(typeof(CalculatorView));
-            Container.RegisterNavigationType(typeof(CalculatorUpDownView));
-        }
+      Container.RegisterNavigationType( typeof( CalculatorView ) );
+      Container.RegisterNavigationType( typeof( CalculatorUpDownView ) );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml
index 69027b32..9876a130 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml
@@ -1,12 +1,30 @@
-<TreeViewItem x:Class="Samples.Modules.Calculator.NavigationItems.CalculatorNavItem"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Calculator.NavigationItems.CalculatorNavItem"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:navItems="clr-namespace:Samples.Modules.Calculator.NavigationItems"
               xmlns:views="clr-namespace:Samples.Modules.Calculator.Views" 
-              Header="Calculator" Tag="{x:Type views:CalculatorView}" >
+              Header="Calculator" Tag="{x:Type views:CalculatorView}">
 
-    <TreeViewItem.Resources>
-        <Style TargetType="navItems:CalculatorNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
+   <TreeViewItem.Resources>
+      <Style TargetType="navItems:CalculatorNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
 
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml.cs
index 06ed77eb..472dd18c 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorNavItem.xaml.cs
@@ -1,16 +1,33 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Controls;
 
 namespace Samples.Modules.Calculator.NavigationItems
 {
-    /// <summary>
-    /// Interaction logic for CalculatorNavItem.xaml
-    /// </summary>
-    public partial class CalculatorNavItem : TreeViewItem
+  /// <summary>
+  /// Interaction logic for CalculatorNavItem.xaml
+  /// </summary>
+  public partial class CalculatorNavItem : TreeViewItem
+  {
+    public CalculatorNavItem()
     {
-        public CalculatorNavItem()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml
index 84ebafe4..1ed12ecb 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml
@@ -1,12 +1,30 @@
-<TreeViewItem x:Class="Samples.Modules.Calculator.NavigationItems.CalculatorUpDownNavItem"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Calculator.NavigationItems.CalculatorUpDownNavItem"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:navItems="clr-namespace:Samples.Modules.Calculator.NavigationItems"
               xmlns:views="clr-namespace:Samples.Modules.Calculator.Views" 
-              Header="CalculatorUpDown" Tag="{x:Type views:CalculatorUpDownView}" >
+              Header="CalculatorUpDown" Tag="{x:Type views:CalculatorUpDownView}">
 
-    <TreeViewItem.Resources>
-        <Style TargetType="navItems:CalculatorUpDownNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
+   <TreeViewItem.Resources>
+      <Style TargetType="navItems:CalculatorUpDownNavItem" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
 
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml.cs
index 809329ea..13e0acfe 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/NavigationItems/CalculatorUpDownNavItem.xaml.cs
@@ -1,16 +1,33 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Controls;
 
 namespace Samples.Modules.Calculator.NavigationItems
 {
-    /// <summary>
-    /// Interaction logic for CalculatorUpDownNavItem.xaml
-    /// </summary>
-    public partial class CalculatorUpDownNavItem : TreeViewItem
+  /// <summary>
+  /// Interaction logic for CalculatorUpDownNavItem.xaml
+  /// </summary>
+  public partial class CalculatorUpDownNavItem : TreeViewItem
+  {
+    public CalculatorUpDownNavItem()
     {
-        public CalculatorUpDownNavItem()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Properties/AssemblyInfo.cs
index 9986fc48..5633c9a0 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Properties/AssemblyInfo.cs
@@ -1,25 +1,41 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Samples.Modules.Caclulator")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Samples.Modules.Caclulator")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Samples.Modules.Caclulator" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Microsoft" )]
+[assembly: AssemblyProduct( "Samples.Modules.Caclulator" )]
+[assembly: AssemblyCopyright( "Copyright © Microsoft 2011" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -33,11 +49,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,5 +67,5 @@ 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml
index 17d27ad8..b31ef14b 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml
@@ -1,62 +1,80 @@
-<infControls:DemoView x:Class="Samples.Modules.Calculator.Views.CalculatorUpDownView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.Calculator.Views.CalculatorUpDownView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="CalculatorUpDown">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="The CalculatorUpDown provides a TextBox with button spinners that allow incrementing and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel. It also provides a Calculator dropdown which allows you to perform mathematical calculations."
-                   TextWrapping="Wrap" />
-
-        <GroupBox Header="Features" Grid.Row="1" Margin="5"  >
-            <Grid Margin="5" HorizontalAlignment="Left">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                <TextBlock Text="Precision: " VerticalAlignment="Center"  />
-                <extToolkit:IntegerUpDown x:Name="_precision" Grid.Column="1" Width="75" HorizontalAlignment="Left"  VerticalAlignment="Center" Margin="5" Minimum="0" Value="2" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
-                <TextBlock Text="FormatString:" Grid.Row="1" VerticalAlignment="Center"/>
-                <ComboBox x:Name="_formatString" SelectedIndex="0" Grid.Row="1" Grid.Column="1" Width="150" Margin="5">
-                    <ComboBoxItem Tag="C2">Currency</ComboBoxItem>
-                    <ComboBoxItem Tag="F2">Fixed Point</ComboBoxItem>
-                    <ComboBoxItem Tag="G">General</ComboBoxItem>
-                    <ComboBoxItem Tag="N">Number</ComboBoxItem>
-                    <ComboBoxItem Tag="P2">Percent</ComboBoxItem>
-                </ComboBox>
-                <TextBlock Text="Watermakr:" Grid.Row="2" VerticalAlignment="Center"/>
-                <TextBox x:Name="_watermark" Grid.Row="2" Grid.Column="1" Width="150" Margin="5" Text="Enter Value"/>                
-                <TextBlock Grid.Column="2" Text="Increment" VerticalAlignment="Center" />
-                <TextBlock Grid.Column="2" Grid.Row="1" Text="Minimum" VerticalAlignment="Center" />
-                <TextBlock Grid.Column="2" Grid.Row="2" Text="Maximum" VerticalAlignment="Center" />
-                <extToolkit:IntegerUpDown Grid.Column="3" Name="_increment" Minimum="0" Value="1" VerticalAlignment="Center" Margin="5" Width="150" />
-                <extToolkit:IntegerUpDown Grid.Column="3" Grid.Row="1" Name="_minimum" Value="-100" VerticalAlignment="Center" Margin="5" Width="150" />
-                <extToolkit:IntegerUpDown Grid.Column="3" Grid.Row="2" Name="_maximum" Value="5000" VerticalAlignment="Center" Margin="5" Width="150" />
-            </Grid>
-        </GroupBox>
-
-        <StackPanel Grid.Row="2" Margin="10" HorizontalAlignment="Left">
-            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-            <extToolkit:CalculatorUpDown Margin="10" Width="250" 
-                                         Increment="{Binding Value, ElementName=_increment}"
-                                         Maximum="{Binding Value, ElementName=_maximum}"
-                                         Minimum="{Binding Value, ElementName=_minimum}"
-                                         Precision="{Binding Value, ElementName=_precision}" 
-                                         FormatString="{Binding SelectedItem.Tag, ElementName=_formatString}" 
-                                         Watermark="{Binding Text, ElementName=_watermark}"/>
-        </StackPanel>
-    </Grid>
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="The CalculatorUpDown provides a TextBox with button spinners that allow incrementing and decrementing numeric values by using the spinner buttons, keyboard up/down arrows, or mouse wheel. It also provides a Calculator dropdown which allows you to perform mathematical calculations."
+                 TextWrapping="Wrap" />
+
+      <GroupBox Header="Features" Grid.Row="1" Margin="5">
+         <Grid Margin="5" HorizontalAlignment="Left">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+            <TextBlock Text="Precision: " VerticalAlignment="Center" />
+            <extToolkit:IntegerUpDown x:Name="_precision" Grid.Column="1" Width="75" HorizontalAlignment="Left"  VerticalAlignment="Center" Margin="5" Minimum="0" Value="2" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
+            <TextBlock Text="FormatString:" Grid.Row="1" VerticalAlignment="Center" />
+            <ComboBox x:Name="_formatString" SelectedIndex="0" Grid.Row="1" Grid.Column="1" Width="150" Margin="5">
+               <ComboBoxItem Tag="C2">Currency</ComboBoxItem>
+               <ComboBoxItem Tag="F2">Fixed Point</ComboBoxItem>
+               <ComboBoxItem Tag="G">General</ComboBoxItem>
+               <ComboBoxItem Tag="N">Number</ComboBoxItem>
+               <ComboBoxItem Tag="P2">Percent</ComboBoxItem>
+            </ComboBox>
+            <TextBlock Text="Watermakr:" Grid.Row="2" VerticalAlignment="Center" />
+            <TextBox x:Name="_watermark" Grid.Row="2" Grid.Column="1" Width="150" Margin="5" Text="Enter Value" />
+            <TextBlock Grid.Column="2" Text="Increment" VerticalAlignment="Center" />
+            <TextBlock Grid.Column="2" Grid.Row="1" Text="Minimum" VerticalAlignment="Center" />
+            <TextBlock Grid.Column="2" Grid.Row="2" Text="Maximum" VerticalAlignment="Center" />
+            <extToolkit:IntegerUpDown Grid.Column="3" Name="_increment" Minimum="0" Value="1" VerticalAlignment="Center" Margin="5" Width="150" />
+            <extToolkit:IntegerUpDown Grid.Column="3" Grid.Row="1" Name="_minimum" Value="-100" VerticalAlignment="Center" Margin="5" Width="150" />
+            <extToolkit:IntegerUpDown Grid.Column="3" Grid.Row="2" Name="_maximum" Value="5000" VerticalAlignment="Center" Margin="5" Width="150" />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="2" Margin="10" HorizontalAlignment="Left">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <extToolkit:CalculatorUpDown Margin="10" Width="250" 
+                                      Increment="{Binding Value, ElementName=_increment}"
+                                      Maximum="{Binding Value, ElementName=_maximum}"
+                                      Minimum="{Binding Value, ElementName=_minimum}"
+                                      Precision="{Binding Value, ElementName=_precision}" 
+                                      FormatString="{Binding SelectedItem.Tag, ElementName=_formatString}" 
+                                      Watermark="{Binding Text, ElementName=_watermark}" />
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml.cs
index f03aa773..49bf129f 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorUpDownView.xaml.cs
@@ -1,18 +1,35 @@
-using System;
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.Calculator.Views
 {
-    /// <summary>
-    /// Interaction logic for CalculatorUpDownView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class CalculatorUpDownView : DemoView
+  /// <summary>
+  /// Interaction logic for CalculatorUpDownView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class CalculatorUpDownView : DemoView
+  {
+    public CalculatorUpDownView()
     {
-        public CalculatorUpDownView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml
index b8b5db0a..dd2ec1d1 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml
@@ -1,39 +1,57 @@
-<infControls:DemoView x:Class="Samples.Modules.Calculator.Views.CalculatorView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.Calculator.Views.CalculatorView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="Calculator">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="The Calculator is a control used for performing mathematical calculations."
-                   TextWrapping="Wrap" />
-
-        <GroupBox Header="Features" Grid.Row="1" Margin="5"  >
-            <Grid Margin="5">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <TextBlock Text="Precision: " VerticalAlignment="Center"  />
-                <extToolkit:IntegerUpDown x:Name="_precision" Grid.Column="1" Width="75" HorizontalAlignment="Left"  VerticalAlignment="Center" Margin="5" Minimum="0" Value="2" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
-            </Grid>
-        </GroupBox>
-
-        <StackPanel Grid.Row="2" Margin="10">
-            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-            <TextBlock Text="When the Calculator has focus, you can use the keyboard to interact with the key pad. Click the Calculator to give focus." Margin="10,0"/>
-            <extToolkit:Calculator Margin="10" Width="250"  Precision="{Binding Value, ElementName=_precision}"  />
-        </StackPanel>
-    </Grid>
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="The Calculator is a control used for performing mathematical calculations."
+                 TextWrapping="Wrap" />
+
+      <GroupBox Header="Features" Grid.Row="1" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="Precision: " VerticalAlignment="Center" />
+            <extToolkit:IntegerUpDown x:Name="_precision" Grid.Column="1" Width="75" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="5" Minimum="0" Value="2" ToolTip="Gets/Sets the maximum number of digits displayed to the right of the decimal point." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="2" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <TextBlock Text="When the Calculator has focus, you can use the keyboard to interact with the key pad. Click the Calculator to give focus." Margin="10,0" />
+         <extToolkit:Calculator Margin="10" Width="250" Precision="{Binding Value, ElementName=_precision}" />
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml.cs
index 8a1a9b01..bf8624ea 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Caclulator/Views/CalculatorView.xaml.cs
@@ -1,18 +1,35 @@
-using System;
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.Calculator.Views
 {
-    /// <summary>
-    /// Interaction logic for CalculatorView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class CalculatorView : DemoView
+  /// <summary>
+  /// Interaction logic for CalculatorView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class CalculatorView : DemoView
+  {
+    public CalculatorView()
     {
-        public CalculatorView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/ChildWindowModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/ChildWindowModule.cs
index 2718933a..f59ef06d 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/ChildWindowModule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/ChildWindowModule.cs
@@ -1,25 +1,44 @@
-using System;
-using Microsoft.Practices.Unity;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
 using Samples.Infrastructure;
 using Samples.Infrastructure.Extensions;
 using Samples.Modules.ChildWindow.Views;
 
 namespace Samples.Modules.ChildWindow
 {
-    public class ChildWindowModule: ModuleBase
+  public class ChildWindowModule : ModuleBase
+  {
+    public ChildWindowModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
     {
-        public ChildWindowModule(IUnityContainer container, IRegionManager regionManager)
-            : base(container, regionManager) { }
-
-        protected override void InitializeModule()
-        {
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView));
-        }
-
-        protected override void RegisterViewsAndTypes()
-        {
-            Container.RegisterNavigationType(typeof(HomeView));
-        }
+      Container.RegisterNavigationType( typeof( HomeView ) );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Properties/AssemblyInfo.cs
index 8325a1b7..013aabf8 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Properties/AssemblyInfo.cs
@@ -1,25 +1,41 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Samples.Modules.ChildWindow")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Samples.Modules.ChildWindow")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Samples.Modules.ChildWindow" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Microsoft" )]
+[assembly: AssemblyProduct( "Samples.Modules.ChildWindow" )]
+[assembly: AssemblyCopyright( "Copyright © Microsoft 2011" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -33,11 +49,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,5 +67,5 @@ 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml
index dad71ea5..6f510d5a 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml
@@ -1,115 +1,133 @@
-<infControls:DemoView x:Class="Samples.Modules.ChildWindow.Views.HomeView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.ChildWindow.Views.HomeView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       xmlns:sys="clr-namespace:System;assembly=mscorlib"
                       Title="ChildWindow">
-    
-    <infControls:DemoView.Resources>
-        <ObjectDataProvider x:Key="WindowStates" MethodName="GetValues"
-                            ObjectType="{x:Type sys:Enum}" >
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="extToolkit:WindowState"/>
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-        <ObjectDataProvider x:Key="WindowStartupLocations" MethodName="GetValues"
-                            ObjectType="{x:Type sys:Enum}" >
-            <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="extToolkit:WindowStartupLocation"/>
-            </ObjectDataProvider.MethodParameters>
-        </ObjectDataProvider>
-    </infControls:DemoView.Resources>
-    
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="ChildWindow description goes here."
-                   TextWrapping="Wrap" />
-
-        <GroupBox Header="Features" Grid.Row="1" Margin="5"  >
-            <Grid Margin="5">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                
-                <TextBlock Text="Caption:" Margin="2" VerticalAlignment="Center" />
-                <TextBox Name="_txtCaption" Grid.Column="1" Margin="5" Text="ChildWindow" VerticalAlignment="Center" />
-
-                <TextBlock Grid.Row="1" Name="textBlock2" Text="Left:" Margin="2" VerticalAlignment="Center" />
-                <extToolkit:DoubleUpDown x:Name="_txtLeft" Grid.Column="1" Grid.Row="1" Value="0" VerticalAlignment="Center" Margin="5" />
-                
-                <TextBlock Grid.Row="2" Name="textBlock3" Text="Top:" Margin="2" VerticalAlignment="Center" />
-                <extToolkit:DoubleUpDown x:Name="_txtTop" Grid.Column="1" Grid.Row="2" Value="0" VerticalAlignment="Center" Margin="5" />
-
-
-                <TextBlock Text="IsModal:" VerticalAlignment="Center" Margin="2" Grid.Column="2" />
-                <CheckBox x:Name="_chkIsModal" Grid.Column="3" VerticalAlignment="Center" Margin="5" IsChecked="True" />
-                
-                <TextBlock Grid.Row="1" Text="WindowState:" VerticalAlignment="Center" Margin="2" Grid.Column="2" />
-                <ComboBox Grid.Column="3" Grid.Row="1" Name="_cboWindowState" ItemsSource="{Binding Source={StaticResource WindowStates}}" SelectedIndex="1" VerticalAlignment="Center" Margin="5" />
-
-                <TextBlock Grid.Row="2" Text="WindowStartupLocation:" VerticalAlignment="Center" Margin="2" Grid.Column="2" />
-                <ComboBox Grid.Column="3" Grid.Row="2" Name="_cboWindowStartupLocations" ItemsSource="{Binding Source={StaticResource WindowStartupLocations}}" SelectedIndex="0" VerticalAlignment="Center" Margin="5" />
 
+   <infControls:DemoView.Resources>
+      <ObjectDataProvider x:Key="WindowStates" MethodName="GetValues"
+                          ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="extToolkit:WindowState" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+      <ObjectDataProvider x:Key="WindowStartupLocations" MethodName="GetValues"
+                          ObjectType="{x:Type sys:Enum}">
+         <ObjectDataProvider.MethodParameters>
+            <x:Type TypeName="extToolkit:WindowStartupLocation" />
+         </ObjectDataProvider.MethodParameters>
+      </ObjectDataProvider>
+   </infControls:DemoView.Resources>
+
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="ChildWindow description goes here."
+                 TextWrapping="Wrap" />
+
+      <GroupBox Header="Features" Grid.Row="1" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <TextBlock Text="Caption:" Margin="2" VerticalAlignment="Center" />
+            <TextBox Name="_txtCaption" Grid.Column="1" Margin="5" Text="ChildWindow" VerticalAlignment="Center" />
+
+            <TextBlock Grid.Row="1" Name="textBlock2" Text="Left:" Margin="2" VerticalAlignment="Center" />
+            <extToolkit:DoubleUpDown x:Name="_txtLeft" Grid.Column="1" Grid.Row="1" Value="0" VerticalAlignment="Center" Margin="5" />
+
+            <TextBlock Grid.Row="2" Name="textBlock3" Text="Top:" Margin="2" VerticalAlignment="Center" />
+            <extToolkit:DoubleUpDown x:Name="_txtTop" Grid.Column="1" Grid.Row="2" Value="0" VerticalAlignment="Center" Margin="5" />
+
+
+            <TextBlock Text="IsModal:" VerticalAlignment="Center" Margin="2" Grid.Column="2" />
+            <CheckBox x:Name="_chkIsModal" Grid.Column="3" VerticalAlignment="Center" Margin="5" IsChecked="True" />
+
+            <TextBlock Grid.Row="1" Text="WindowState:" VerticalAlignment="Center" Margin="2" Grid.Column="2" />
+            <ComboBox Grid.Column="3" Grid.Row="1" Name="_cboWindowState" ItemsSource="{Binding Source={StaticResource WindowStates}}" SelectedIndex="1" VerticalAlignment="Center" Margin="5" />
+
+            <TextBlock Grid.Row="2" Text="WindowStartupLocation:" VerticalAlignment="Center" Margin="2" Grid.Column="2" />
+            <ComboBox Grid.Column="3" Grid.Row="2" Name="_cboWindowStartupLocations" ItemsSource="{Binding Source={StaticResource WindowStartupLocations}}" SelectedIndex="0" VerticalAlignment="Center" Margin="5" />
+
+         </Grid>
+      </GroupBox>
+
+      <Grid Grid.Row="2" Margin="10">
+         <extToolkit:ChildWindow Width="350"
+                                 Caption="{Binding Text, ElementName=_txtCaption}"
+                                 IsModal="{Binding IsChecked, ElementName=_chkIsModal}"
+                                 Left="{Binding Value, ElementName=_txtLeft, Mode=TwoWay}"
+                                 Top="{Binding Value, ElementName=_txtTop, Mode=TwoWay}"
+                                 WindowStartupLocation="{Binding SelectedItem, ElementName=_cboWindowStartupLocations}" 
+                                 WindowState="{Binding SelectedItem, ElementName=_cboWindowState}">
+            <Grid Margin="10" >
+               <Grid.RowDefinitions>
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+                  <RowDefinition Height="Auto" />
+               </Grid.RowDefinitions>
+               <Grid.ColumnDefinitions>
+                  <ColumnDefinition Width="Auto" />
+                  <ColumnDefinition Width="*" />
+               </Grid.ColumnDefinitions>
+
+               <TextBlock Grid.Row="0" Text="First Name:" Margin="2" VerticalAlignment="Center" />
+               <extToolkit:WatermarkTextBox Grid.Row="0" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter First Name" />
+
+               <TextBlock Grid.Row="1" Text="Last Name:" Margin="2" VerticalAlignment="Center" />
+               <extToolkit:WatermarkTextBox Grid.Row="1" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter Last Name" />
+
+               <TextBlock Grid.Row="2" Text="Date of Birth:" Margin="2" VerticalAlignment="Center" />
+               <extToolkit:DateTimeUpDown Grid.Row="2" Grid.Column="1" Format="ShortDate" Margin="2" VerticalAlignment="Center" Watermark="Enter Date of Birth" />
+
+               <TextBlock Grid.Row="3" Text="Salary:" Margin="2" VerticalAlignment="Center" />
+               <extToolkit:IntegerUpDown Grid.Row="3" Grid.Column="1" FormatString="C2" Margin="2" VerticalAlignment="Center" Watermark="Enter Salary" />
+
+               <TextBlock Grid.Row="4" Text="Favorite Color:" Margin="2" VerticalAlignment="Center" />
+               <extToolkit:ColorPicker Grid.Row="4" Grid.Column="1" Margin="2" VerticalAlignment="Center" />
+
+               <StackPanel Grid.Row="5" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
+                  <Button Width="65" Margin="2">OK</Button>
+                  <Button Width="65" Margin="2">Cancel</Button>
+               </StackPanel>
             </Grid>
-        </GroupBox>
-
-        <Grid Grid.Row="2" Margin="10">
-            <extToolkit:ChildWindow Width="350"
-                                    Caption="{Binding Text, ElementName=_txtCaption}"
-                                    IsModal="{Binding IsChecked, ElementName=_chkIsModal}"
-                                    Left="{Binding Value, ElementName=_txtLeft, Mode=TwoWay}"
-                                    Top="{Binding Value, ElementName=_txtTop, Mode=TwoWay}"
-                                    WindowStartupLocation="{Binding SelectedItem, ElementName=_cboWindowStartupLocations}" 
-                                    WindowState="{Binding SelectedItem, ElementName=_cboWindowState}">
-                <Grid Margin="10" >
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="Auto" />
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                        <RowDefinition Height="Auto"/>
-                    </Grid.RowDefinitions>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
-
-                    <TextBlock Grid.Row="0" Text="First Name:" Margin="2" VerticalAlignment="Center" />
-                    <extToolkit:WatermarkTextBox Grid.Row="0" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter First Name"  />
-
-                    <TextBlock Grid.Row="1" Text="Last Name:" Margin="2" VerticalAlignment="Center" />
-                    <extToolkit:WatermarkTextBox Grid.Row="1" Grid.Column="1" Margin="2" VerticalAlignment="Center" Watermark="Enter Last Name"  />
-
-                    <TextBlock Grid.Row="2" Text="Date of Birth:" Margin="2" VerticalAlignment="Center" />
-                    <extToolkit:DateTimeUpDown Grid.Row="2" Grid.Column="1" Format="ShortDate" Margin="2" VerticalAlignment="Center" Watermark="Enter Date of Birth" />
-
-                    <TextBlock Grid.Row="3" Text="Salary:" Margin="2" VerticalAlignment="Center" />
-                    <extToolkit:IntegerUpDown Grid.Row="3" Grid.Column="1" FormatString="C2" Margin="2" VerticalAlignment="Center" Watermark="Enter Salary"  />
-
-                    <TextBlock Grid.Row="4" Text="Favorite Color:" Margin="2" VerticalAlignment="Center" />
-                    <extToolkit:ColorPicker Grid.Row="4" Grid.Column="1" Margin="2" VerticalAlignment="Center" />
-
-                    <StackPanel Grid.Row="5" Grid.ColumnSpan="2" Orientation="Horizontal" HorizontalAlignment="Center" Margin="0,10,0,0">
-                        <Button Width="65" Margin="2">OK</Button>
-                        <Button Width="65" Margin="2">Cancel</Button>
-                    </StackPanel>
-                </Grid>
-            </extToolkit:ChildWindow>
-        </Grid>
-    </Grid>
+         </extToolkit:ChildWindow>
+      </Grid>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml.cs
index 6d235496..5d279156 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/HomeView.xaml.cs
@@ -1,18 +1,35 @@
-using System;
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.ChildWindow.Views
 {
-    /// <summary>
-    /// Interaction logic for HomeView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class HomeView : DemoView
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
     {
-        public HomeView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml
index 85fb643e..78e12432 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml
@@ -1,11 +1,29 @@
-<TreeViewItem x:Class="Samples.Modules.ChildWindow.Views.NavigationView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.ChildWindow.Views.NavigationView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:views="clr-namespace:Samples.Modules.ChildWindow.Views"
               Header="ChildWindow" Tag="{x:Type views:HomeView}">
 
-    <TreeViewItem.Resources>
-        <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
 
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml.cs
index 0b945bd3..2711094f 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.ChildWindow/Views/NavigationView.xaml.cs
@@ -1,27 +1,33 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.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 Samples.Modules.ChildWindow.Views
 {
-    /// <summary>
-    /// Interaction logic for NavigationView.xaml
-    /// </summary>
-    public partial class NavigationView : TreeViewItem
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
     {
-        public NavigationView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/ColorModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/ColorModule.cs
index 14d15354..6f0da1e1 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/ColorModule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/ColorModule.cs
@@ -1,6 +1,23 @@
-using System;
-using Microsoft.Practices.Unity;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
 using Samples.Infrastructure;
 using Samples.Infrastructure.Extensions;
 using Samples.Modules.Color.Views;
@@ -8,19 +25,21 @@ using Samples.Modules.Color.Views;
 
 namespace Samples.Modules.Color
 {
-    public class ColorModule: ModuleBase
+  public class ColorModule : ModuleBase
+  {
+    public ColorModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
     {
-        public ColorModule(IUnityContainer container, IRegionManager regionManager)
-            : base(container, regionManager) { }
-
-        protected override void InitializeModule()
-        {
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView));
-        }
-
-        protected override void RegisterViewsAndTypes()
-        {
-            Container.RegisterNavigationType(typeof(HomeView));
-        }
+      Container.RegisterNavigationType( typeof( HomeView ) );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Properties/AssemblyInfo.cs
index 4aea87b0..e499b6a3 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Properties/AssemblyInfo.cs
@@ -1,25 +1,41 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Samples.Modules.Color")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Samples.Modules.Color")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Samples.Modules.Color" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Microsoft" )]
+[assembly: AssemblyProduct( "Samples.Modules.Color" )]
+[assembly: AssemblyCopyright( "Copyright © Microsoft 2011" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -33,11 +49,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,5 +67,5 @@ 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml
index 5b2e5157..0f67a27d 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml
@@ -1,12 +1,30 @@
-<infControls:DemoView x:Class="Samples.Modules.Color.Views.HomeView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.Color.Views.HomeView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       xmlns:System="clr-namespace:System;assembly=mscorlib"
                       Title="Color Controls">
-    <Grid Margin="25">
-        <!--<DataGrid x:Name="_dataGrid"
+   <Grid Margin="25">
+      <!--<DataGrid x:Name="_dataGrid"
             AutoGenerateColumns="False"
             CanUserAddRows="False"
             CanUserDeleteRows="False"
@@ -23,37 +41,40 @@
             </DataGrid.Columns>
         </DataGrid>-->
 
-        <StackPanel>
-            <extToolkit:CheckComboBox x:Name="_combo" HorizontalAlignment="Center" VerticalAlignment="Center" 
-                                      DisplayMemberPath="Color"
-                                      ValueMemberPath="Level"
-                                      SelectedValue="{Binding SelectedValue}"
-                                      SelectedItems="{Binding SelectedItems}"/>
+      <StackPanel>
+         <extToolkit:CheckComboBox x:Name="_combo" 
+                                   HorizontalAlignment="Center" 
+                                   VerticalAlignment="Center" 
+                                   DisplayMemberPath="Color"
+                                   ValueMemberPath="Level"
+                                   SelectedValue="{Binding SelectedValue}"
+                                   SelectedItems="{Binding SelectedItems}" />
 
-            <!--<extToolkit:CheckComboBox x:Name="_combo" HorizontalAlignment="Center" VerticalAlignment="Center"
+         <!--<extToolkit:CheckComboBox x:Name="_combo" HorizontalAlignment="Center" VerticalAlignment="Center"
                                       SelectedValue="{Binding SelectedValues}" />-->
-            
-            <!--<ComboBox x:Name="_combo2" HorizontalAlignment="Center" VerticalAlignment="Center"
+
+         <!--<ComboBox x:Name="_combo2" HorizontalAlignment="Center" VerticalAlignment="Center"
                       IsEditable="True"
                       DisplayMemberPath="Color"
                       />-->
 
-            <extToolkit:CheckListBox x:Name="_listBox" Height="250"
-                                      DisplayMemberPath="Color"
-                                      ValueMemberPath="Level" 
-                                     SelectedMemberPath="IsSelected"
-                                     SelectedValue="{Binding SelectedValue}"
-                                     SelectedItems="{Binding SelectedItems}"/>
+         <extToolkit:CheckListBox x:Name="_listBox" 
+                                  Height="250"
+                                  DisplayMemberPath="Color"
+                                  ValueMemberPath="Level" 
+                                  SelectedMemberPath="IsSelected"
+                                  SelectedValue="{Binding SelectedValue}"
+                                  SelectedItems="{Binding SelectedItems}" />
 
-            <!--<extToolkit:CheckListBox x:Name="_listBox" Height="250"
+         <!--<extToolkit:CheckListBox x:Name="_listBox" Height="250"
                                      SelectedValue="{Binding SelectedValues}"
                                      />-->
-            
-            <TextBlock Text="{Binding SelectedValue}" />
-            <ListBox ItemsSource="{Binding SelectedItems}" Height="50" />
-            
-            <Button Click="Button_Click">Set</Button>
-            
-        </StackPanel>
-    </Grid>
+
+         <TextBlock Text="{Binding SelectedValue}" />
+         <ListBox ItemsSource="{Binding SelectedItems}" Height="50" />
+
+         <Button Click="Button_Click">Set</Button>
+
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml.cs
index 9239f32b..43381375 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/HomeView.xaml.cs
@@ -1,160 +1,198 @@
-using System;
-using Samples.Infrastructure.Controls;
-using Microsoft.Practices.Prism.Regions;
-using System.ComponentModel;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.ComponentModel;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.Color.Views
 {
-    /// <summary>
-    /// Interaction logic for HomeView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class HomeView : DemoView
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
+    {
+      InitializeComponent();
+
+      DataContext = new Data();
+
+      //List<string> colors = new List<string>();
+      //colors.Add("1");
+      //colors.Add("2");
+      //colors.Add("3");
+      //colors.Add("4");
+      //colors.Add("5");
+      //colors.Add("6");
+      //colors.Add("7");
+      //colors.Add("8");
+      //colors.Add("9");
+      //colors.Add("10");
+
+
+      List<Person> colors = new List<Person>();
+      colors.Add( new Person( System.Windows.Media.Colors.Red, 0 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.Purple, 1 )
+      {
+        IsSelected = true
+      } );
+      colors.Add( new Person( System.Windows.Media.Colors.Coral, 2 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.MidnightBlue, 3 )
+      {
+        IsSelected = true
+      } );
+      colors.Add( new Person( System.Windows.Media.Colors.Green, 4 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.Red, 5 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.Purple, 6 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.SaddleBrown, 7 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.MidnightBlue, 8 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.Green, 9 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.Red, 10 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.Purple, 11 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.SaddleBrown, 12 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.MidnightBlue, 13 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.Green, 14 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.Red, 15 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.Purple, 16 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.SaddleBrown, 17 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.MidnightBlue, 18 ) );
+      colors.Add( new Person( System.Windows.Media.Colors.Green, 19 ) );
+
+      //_dataGrid.ItemsSource = colors;
+      //_chk.ItemsSource = colors;
+      _combo.ItemsSource = colors;
+      //_combo.SelectedValue = "1,3,5,7,9,";
+
+      _listBox.ItemsSource = colors;
+      //_listBox.SelectedValue = "1,3,5,7,9,";
+    }
+
+    private void Button_Click( object sender, System.Windows.RoutedEventArgs e )
+    {
+      ( DataContext as Data ).SelectedValue = "1,3,5,7,9,";
+    }
+  }
+
+  public class Data : INotifyPropertyChanged
+  {
+    private string _selectedValues;// = "1,3,5,7,9,";
+    public string SelectedValue
+    {
+      get
+      {
+        return _selectedValues;
+      }
+      set
+      {
+        _selectedValues = value;
+        OnPropertyChanged( "SelectedValue" );
+      }
+    }
+
+    private ObservableCollection<Person> _selectedItems = new ObservableCollection<Person>();
+    public ObservableCollection<Person> SelectedItems
+    {
+      get
+      {
+        return _selectedItems;
+      }
+      set
+      {
+        _selectedItems = value;
+        OnPropertyChanged( "SelectedItems" );
+      }
+    }
+
+    public Data()
     {
-        public HomeView()
-        {
-            InitializeComponent();
-
-            DataContext = new Data();
-
-            //List<string> colors = new List<string>();
-            //colors.Add("1");
-            //colors.Add("2");
-            //colors.Add("3");
-            //colors.Add("4");
-            //colors.Add("5");
-            //colors.Add("6");
-            //colors.Add("7");
-            //colors.Add("8");
-            //colors.Add("9");
-            //colors.Add("10");
-
-
-            List<Person> colors = new List<Person>();
-            colors.Add(new Person(System.Windows.Media.Colors.Red, 0));
-            colors.Add(new Person(System.Windows.Media.Colors.Purple, 1) { IsSelected = true });
-            colors.Add(new Person(System.Windows.Media.Colors.Coral, 2));
-            colors.Add(new Person(System.Windows.Media.Colors.MidnightBlue, 3) { IsSelected = true });
-            colors.Add(new Person(System.Windows.Media.Colors.Green, 4));
-            colors.Add(new Person(System.Windows.Media.Colors.Red, 5));
-            colors.Add(new Person(System.Windows.Media.Colors.Purple, 6));
-            colors.Add(new Person(System.Windows.Media.Colors.SaddleBrown, 7));
-            colors.Add(new Person(System.Windows.Media.Colors.MidnightBlue, 8));
-            colors.Add(new Person(System.Windows.Media.Colors.Green, 9));
-            colors.Add(new Person(System.Windows.Media.Colors.Red, 10));
-            colors.Add(new Person(System.Windows.Media.Colors.Purple, 11));
-            colors.Add(new Person(System.Windows.Media.Colors.SaddleBrown, 12));
-            colors.Add(new Person(System.Windows.Media.Colors.MidnightBlue, 13));
-            colors.Add(new Person(System.Windows.Media.Colors.Green, 14));
-            colors.Add(new Person(System.Windows.Media.Colors.Red, 15));
-            colors.Add(new Person(System.Windows.Media.Colors.Purple, 16));
-            colors.Add(new Person(System.Windows.Media.Colors.SaddleBrown, 17));
-            colors.Add(new Person(System.Windows.Media.Colors.MidnightBlue, 18));
-            colors.Add(new Person(System.Windows.Media.Colors.Green, 19));
-
-            //_dataGrid.ItemsSource = colors;
-            //_chk.ItemsSource = colors;
-            _combo.ItemsSource = colors;
-            //_combo.SelectedValue = "1,3,5,7,9,";
-
-            _listBox.ItemsSource = colors;
-            //_listBox.SelectedValue = "1,3,5,7,9,";
-        }
-
-        private void Button_Click(object sender, System.Windows.RoutedEventArgs e)
-        {
-            (DataContext as Data).SelectedValue = "1,3,5,7,9,";
-        }
     }
 
-    public class Data: INotifyPropertyChanged
+    public event PropertyChangedEventHandler PropertyChanged;
+    protected void OnPropertyChanged( string propertyName )
     {
-        private string _selectedValues;// = "1,3,5,7,9,";
-        public string SelectedValue
-        {
-            get
-            {
-                return _selectedValues;
-            }
-            set
-            {
-                _selectedValues = value;
-                OnPropertyChanged("SelectedValue");
-            }
-        }
-
-        private ObservableCollection<Person> _selectedItems = new ObservableCollection<Person>();
-        public ObservableCollection<Person> SelectedItems
-        {
-            get { return _selectedItems; }
-            set
-            {
-                _selectedItems = value;
-                OnPropertyChanged("SelectedItems");
-            }
-        }
-
-        public Data()
-        {
-        }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-        protected void OnPropertyChanged(string propertyName)
-        {
-            if (PropertyChanged != null)
-                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-        }
+      if( PropertyChanged != null )
+        PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
     }
+  }
 
-    public class Person : INotifyPropertyChanged
+  public class Person : INotifyPropertyChanged
+  {
+    private bool _isSelected;
+    public bool IsSelected
     {
-        private bool _isSelected;
-        public bool IsSelected
-        {
-            get { return _isSelected; }
-            set
-            {
-                _isSelected = value;
-                OnPropertyChanged("IsSelected");
-            }
-        }
-
-        System.Windows.Media.Color _color;
-        public System.Windows.Media.Color Color
-        {
-            get { return _color; }
-            set
-            {
-                _color = value;
-                OnPropertyChanged("Color");
-            }
-        }
-
-        int _level;
-        public int Level
-        {
-            get { return _level; }
-            set { _level = value; OnPropertyChanged("Level"); }
-        }
-
-        public Person()
-        {
-        }
-
-        public Person(System.Windows.Media.Color color, int level)
-        {
-            this._color = color;
-            this._level = level;
-        }
-
-        public event PropertyChangedEventHandler PropertyChanged;
-        protected void OnPropertyChanged(string propertyName)
-        {
-            if (PropertyChanged != null)
-                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-        }
+      get
+      {
+        return _isSelected;
+      }
+      set
+      {
+        _isSelected = value;
+        OnPropertyChanged( "IsSelected" );
+      }
     }
 
+    System.Windows.Media.Color _color;
+    public System.Windows.Media.Color Color
+    {
+      get
+      {
+        return _color;
+      }
+      set
+      {
+        _color = value;
+        OnPropertyChanged( "Color" );
+      }
+    }
+
+    int _level;
+    public int Level
+    {
+      get
+      {
+        return _level;
+      }
+      set
+      {
+        _level = value;
+        OnPropertyChanged( "Level" );
+      }
+    }
+
+    public Person()
+    {
+    }
+
+    public Person( System.Windows.Media.Color color, int level )
+    {
+      this._color = color;
+      this._level = level;
+    }
+
+    public event PropertyChangedEventHandler PropertyChanged;
+    protected void OnPropertyChanged( string propertyName )
+    {
+      if( PropertyChanged != null )
+        PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
+    }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml
index 62cef899..46db83e2 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml
@@ -1,11 +1,29 @@
-<TreeViewItem x:Class="Samples.Modules.Color.Views.NavigationView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Color.Views.NavigationView"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:views="clr-namespace:Samples.Modules.Color.Views"
               Header="Color" Tag="{x:Type views:HomeView}">
 
-    <TreeViewItem.Resources>
-        <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
 
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml.cs
index eb1edea2..7653750d 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Color/Views/NavigationView.xaml.cs
@@ -1,27 +1,33 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.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 Samples.Modules.Color.Views
 {
-    /// <summary>
-    /// Interaction logic for NavigationView.xaml
-    /// </summary>
-    public partial class NavigationView : TreeViewItem
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
     {
-        public NavigationView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/DateTimeModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/DateTimeModule.cs
index c96be567..3bbbc8ec 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/DateTimeModule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/DateTimeModule.cs
@@ -1,25 +1,44 @@
-using System;
-using Microsoft.Practices.Unity;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
 using Samples.Infrastructure;
 using Samples.Infrastructure.Extensions;
 using Samples.Modules.DateTime.Views;
 
 namespace Samples.Modules.DateTime
 {
-    public class DateTimeModule: ModuleBase
+  public class DateTimeModule : ModuleBase
+  {
+    public DateTimeModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
     {
-        public DateTimeModule(IUnityContainer container, IRegionManager regionManager)
-            : base(container, regionManager) { }
-
-        protected override void InitializeModule()
-        {
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView));
-        }
-
-        protected override void RegisterViewsAndTypes()
-        {
-            Container.RegisterNavigationType(typeof(HomeView));
-        }
+      Container.RegisterNavigationType( typeof( HomeView ) );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Properties/AssemblyInfo.cs
index 8e6a5701..7af4eebb 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Properties/AssemblyInfo.cs
@@ -1,25 +1,41 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Samples.Modules.DateTime")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Samples.Modules.DateTime")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Samples.Modules.DateTime" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Microsoft" )]
+[assembly: AssemblyProduct( "Samples.Modules.DateTime" )]
+[assembly: AssemblyCopyright( "Copyright © Microsoft 2011" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -33,11 +49,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,5 +67,5 @@ 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml
index d1297321..052d2028 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml
@@ -1,10 +1,28 @@
-<infControls:DemoView x:Class="Samples.Modules.DateTime.Views.HomeView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.DateTime.Views.HomeView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       Title="DateTime Controls">
-    <Grid>
-        <extToolkit:DateTimePicker IsReadOnly="False"  />
-    </Grid>
+   <Grid>
+      <extToolkit:DateTimePicker IsReadOnly="False" />
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml.cs
index 7a4e52c2..ff26f127 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/HomeView.xaml.cs
@@ -1,18 +1,35 @@
-using System;
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.DateTime.Views
 {
-    /// <summary>
-    /// Interaction logic for HomeView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class HomeView : DemoView
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
     {
-        public HomeView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml
index 2e829a11..df3226eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml
@@ -1,11 +1,29 @@
-<TreeViewItem x:Class="Samples.Modules.DateTime.Views.NavigationView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.DateTime.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:views="clr-namespace:Samples.Modules.DateTime.Views"
               Header="DateTime" Tag="{x:Type views:HomeView}">
 
-    <TreeViewItem.Resources>
-        <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
 
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml.cs
index 7f51386e..8185d56f 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.DateTime/Views/NavigationView.xaml.cs
@@ -1,27 +1,33 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.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 Samples.Modules.DateTime.Views
 {
-    /// <summary>
-    /// Interaction logic for NavigationView.xaml
-    /// </summary>
-    public partial class NavigationView : TreeViewItem
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
     {
-        public NavigationView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/NumericModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/NumericModule.cs
index c5046a06..2b8bf069 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/NumericModule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/NumericModule.cs
@@ -1,25 +1,44 @@
-using System;
-using Microsoft.Practices.Unity;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
 using Samples.Infrastructure;
 using Samples.Infrastructure.Extensions;
 using Samples.Modules.Numeric.Views;
 
 namespace Samples.Modules.Numeric
 {
-    public class NumericModule: ModuleBase
+  public class NumericModule : ModuleBase
+  {
+    public NumericModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
     {
-        public NumericModule(IUnityContainer container, IRegionManager regionManager)
-            : base(container, regionManager) { }
-
-        protected override void InitializeModule()
-        {
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView));
-        }
-
-        protected override void RegisterViewsAndTypes()
-        {
-            Container.RegisterNavigationType(typeof(HomeView));
-        }
+      Container.RegisterNavigationType( typeof( HomeView ) );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Properties/AssemblyInfo.cs
index e506ed53..5a90e5df 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Properties/AssemblyInfo.cs
@@ -1,25 +1,41 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Samples.Modules.Numeric")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Samples.Modules.Numeric")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Samples.Modules.Numeric" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Microsoft" )]
+[assembly: AssemblyProduct( "Samples.Modules.Numeric" )]
+[assembly: AssemblyCopyright( "Copyright © Microsoft 2011" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -33,11 +49,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,5 +67,5 @@ 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml
index db79bbe5..04321d33 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml
@@ -1,9 +1,27 @@
-<infControls:DemoView x:Class="Samples.Modules.Numeric.Views.HomeView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.Numeric.Views.HomeView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       Title="Numeric Controls">
-    <Grid>
-        <TextBlock Text="Numeric View" />
-    </Grid>
+   <Grid>
+      <TextBlock Text="Numeric View" />
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml.cs
index 373e638e..ad2745dd 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/HomeView.xaml.cs
@@ -1,18 +1,35 @@
-using System;
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.Numeric.Views
 {
-    /// <summary>
-    /// Interaction logic for HomeView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class HomeView : DemoView
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
     {
-        public HomeView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml
index bba5c5f9..55054851 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml
@@ -1,11 +1,29 @@
-<TreeViewItem x:Class="Samples.Modules.Numeric.Views.NavigationView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Numeric.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:views="clr-namespace:Samples.Modules.Numeric.Views"
               Header="Numeric" Tag="{x:Type views:HomeView}">
 
-    <TreeViewItem.Resources>
-        <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
 
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml.cs
index 3cf8349e..4359a442 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Numeric/Views/NavigationView.xaml.cs
@@ -1,27 +1,33 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.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 Samples.Modules.Numeric.Views
 {
-    /// <summary>
-    /// Interaction logic for NavigationView.xaml
-    /// </summary>
-    public partial class NavigationView : TreeViewItem
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
     {
-        public NavigationView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Properties/AssemblyInfo.cs
index a5f9806e..8f5f3cea 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Properties/AssemblyInfo.cs
@@ -1,25 +1,41 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Samples.Modules.PropertyGrid")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Samples.Modules.PropertyGrid")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Samples.Modules.PropertyGrid" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Microsoft" )]
+[assembly: AssemblyProduct( "Samples.Modules.PropertyGrid" )]
+[assembly: AssemblyCopyright( "Copyright © Microsoft 2011" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -33,11 +49,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,5 +67,5 @@ 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/PropertyGridModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/PropertyGridModule.cs
index 62e5fa7e..8651a54a 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/PropertyGridModule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/PropertyGridModule.cs
@@ -1,31 +1,50 @@
-using System;
-using Microsoft.Practices.Unity;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
 using Samples.Infrastructure;
 using Samples.Infrastructure.Extensions;
 using Samples.Modules.PropertyGrid.Views;
 
 namespace Samples.Modules.PropertyGrid
 {
-    public class PropertyGridModule: ModuleBase
+  public class PropertyGridModule : ModuleBase
+  {
+    public PropertyGridModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
     {
-        public PropertyGridModule(IUnityContainer container, IRegionManager regionManager)
-            : base(container, regionManager) { }
-
-        protected override void InitializeModule()
-        {
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView));
-        }
-
-        protected override void RegisterViewsAndTypes()
-        {
-            Container.RegisterNavigationType(typeof(HomeView));
-            Container.RegisterNavigationType(typeof(CustomEditors));
-            Container.RegisterNavigationType(typeof(CustomItemsSource));
-            Container.RegisterNavigationType(typeof(DefaultEditors));
-            Container.RegisterNavigationType(typeof(ExpandableProperties));
-            Container.RegisterNavigationType(typeof(SpecifyingProperties));
-            Container.RegisterNavigationType(typeof(BindingToStructs));
-        }
+      Container.RegisterNavigationType( typeof( HomeView ) );
+      Container.RegisterNavigationType( typeof( CustomEditors ) );
+      Container.RegisterNavigationType( typeof( CustomItemsSource ) );
+      Container.RegisterNavigationType( typeof( DefaultEditors ) );
+      Container.RegisterNavigationType( typeof( ExpandableProperties ) );
+      Container.RegisterNavigationType( typeof( SpecifyingProperties ) );
+      Container.RegisterNavigationType( typeof( BindingToStructs ) );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml
index f2747400..f9827d1c 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml
@@ -1,9 +1,27 @@
-<UserControl x:Class="Samples.Modules.PropertyGrid.LastNameUserControlEditor"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<UserControl x:Class="Samples.Modules.PropertyGrid.LastNameUserControlEditor"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              x:Name="_uc">
-        <StackPanel>
-            <TextBox Text="{Binding Value, ElementName=_uc}" Background="YellowGreen"  />
-            <Button Click="Button_Click">Clear</Button>
-        </StackPanel>
+   <StackPanel>
+      <TextBox Text="{Binding Value, ElementName=_uc}" Background="YellowGreen" />
+      <Button Click="Button_Click">Clear</Button>
+   </StackPanel>
 </UserControl>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
index b5dab36f..8cb39492 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Resources/LastNameUserControlEditor.xaml.cs
@@ -1,39 +1,63 @@
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Windows;
 using System.Windows.Controls;
-using Microsoft.Windows.Controls.PropertyGrid.Editors;
 using System.Windows.Data;
+using Microsoft.Windows.Controls.PropertyGrid.Editors;
 
 namespace Samples.Modules.PropertyGrid
 {
-    /// <summary>
-    /// Interaction logic for LastNameUserControlEditor.xaml
-    /// </summary>
-    public partial class LastNameUserControlEditor : UserControl, ITypeEditor
+  /// <summary>
+  /// Interaction logic for LastNameUserControlEditor.xaml
+  /// </summary>
+  public partial class LastNameUserControlEditor : UserControl, ITypeEditor
+  {
+    public LastNameUserControlEditor()
+    {
+      InitializeComponent();
+    }
+
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( string ), typeof( LastNameUserControlEditor ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault ) );
+    public string Value
+    {
+      get
+      {
+        return ( string )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
+
+    private void Button_Click( object sender, RoutedEventArgs e )
+    {
+      Value = string.Empty;
+    }
+
+    public FrameworkElement ResolveEditor( Microsoft.Windows.Controls.PropertyGrid.PropertyItem propertyItem )
     {
-        public LastNameUserControlEditor()
-        {
-            InitializeComponent();
-        }
-
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register("Value", typeof(string), typeof(LastNameUserControlEditor), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault));
-        public string Value
-        {
-            get { return (string)GetValue(ValueProperty); }
-            set { SetValue(ValueProperty, value); }
-        }        
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            Value = string.Empty;
-        }
-
-        public FrameworkElement ResolveEditor(Microsoft.Windows.Controls.PropertyGrid.PropertyItem propertyItem)
-        {
-            Binding binding = new Binding("Value");
-            binding.Source = propertyItem;
-            binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
-            BindingOperations.SetBinding(this, LastNameUserControlEditor.ValueProperty, binding);
-            return this;
-        }
+      Binding binding = new Binding( "Value" );
+      binding.Source = propertyItem;
+      binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+      BindingOperations.SetBinding( this, LastNameUserControlEditor.ValueProperty, binding );
+      return this;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml
index ff8860f7..abd6d276 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml
@@ -1,4 +1,22 @@
-<infControls:DemoView  x:Class="Samples.Modules.PropertyGrid.Views.BindingToStructs"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView  x:Class="Samples.Modules.PropertyGrid.Views.BindingToStructs"
                        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                        xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
@@ -6,46 +24,46 @@
                        xmlns:local="clr-namespace:Samples.Modules.PropertyGrid.Views"
                        Title="Binding to Structs">
 
-    <infControls:DemoView.Resources>
-        <local:DimensionsConverter x:Key="DimensionsConverter" />
-    </infControls:DemoView.Resources>
-    <Grid>
-
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="When the SelectedObject contains properties of type Struct youmay find that edits performed in the PropertyGrid do not function properly.  This is because Structs are passed by value.  Meaning that the PropertyGrid receives a copy of the Struct and not a reference.  When this happens, the data binding expressions end up binding to and modifying that copy rather than the original values."
-                   TextWrapping="Wrap" />
-
-        <StackPanel Grid.Row="1" Margin="10">
-            <TextBlock Text="Binding to Structs:" Style="{StaticResource Header}" />
-            <TextBlock Text="The solution to this problem is to create a custom editor and provide an IValueConverter to handle the proper conversion of the Struct values." TextWrapping="Wrap" />
-            <extToolkit:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10"  >
-                <extToolkit:PropertyGrid.EditorDefinitions>
-                    <extToolkit:EditorDefinition TargetType="{x:Type local:Dimension}">
-                        <extToolkit:EditorDefinition.EditorTemplate>
-                            <DataTemplate>
-                                <Grid Margin="5" >
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto" />
-                                        <ColumnDefinition Width="*" />
-                                    </Grid.ColumnDefinitions>                                    
-                                    <TextBlock Text="Height: " />
-                                    <TextBox Grid.Column="1" Text="{Binding Path=Value, Converter={StaticResource DimensionsConverter},ConverterParameter=Height}" />
-                                    <TextBlock Grid.Row="1" Text="Weight: " />
-                                    <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Path=Value, Converter={StaticResource DimensionsConverter},ConverterParameter=Weight}" />
-                                </Grid>
-                            </DataTemplate>
-                        </extToolkit:EditorDefinition.EditorTemplate>
-                    </extToolkit:EditorDefinition>
-                </extToolkit:PropertyGrid.EditorDefinitions>
-            </extToolkit:PropertyGrid>
-        </StackPanel>
-    </Grid>
+   <infControls:DemoView.Resources>
+      <local:DimensionsConverter x:Key="DimensionsConverter" />
+   </infControls:DemoView.Resources>
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="When the SelectedObject contains properties of type Struct youmay find that edits performed in the PropertyGrid do not function properly.  This is because Structs are passed by value.  Meaning that the PropertyGrid receives a copy of the Struct and not a reference.  When this happens, the data binding expressions end up binding to and modifying that copy rather than the original values."
+                 TextWrapping="Wrap" />
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Binding to Structs:" Style="{StaticResource Header}" />
+         <TextBlock Text="The solution to this problem is to create a custom editor and provide an IValueConverter to handle the proper conversion of the Struct values." TextWrapping="Wrap" />
+         <extToolkit:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10">
+            <extToolkit:PropertyGrid.EditorDefinitions>
+               <extToolkit:EditorDefinition TargetType="{x:Type local:Dimension}">
+                  <extToolkit:EditorDefinition.EditorTemplate>
+                     <DataTemplate>
+                        <Grid Margin="5">
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition Height="Auto" />
+                           </Grid.RowDefinitions>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto" />
+                              <ColumnDefinition Width="*" />
+                           </Grid.ColumnDefinitions>
+                           <TextBlock Text="Height: " />
+                           <TextBox Grid.Column="1" Text="{Binding Path=Value, Converter={StaticResource DimensionsConverter},ConverterParameter=Height}" />
+                           <TextBlock Grid.Row="1" Text="Weight: " />
+                           <TextBox Grid.Row="1" Grid.Column="1" Text="{Binding Path=Value, Converter={StaticResource DimensionsConverter},ConverterParameter=Weight}" />
+                        </Grid>
+                     </DataTemplate>
+                  </extToolkit:EditorDefinition.EditorTemplate>
+               </extToolkit:EditorDefinition>
+            </extToolkit:PropertyGrid.EditorDefinitions>
+         </extToolkit:PropertyGrid>
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml.cs
index 4ebdca67..ee3087bc 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/BindingToStructs.xaml.cs
@@ -1,96 +1,118 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
+using System.ComponentModel;
 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 Samples.Infrastructure.Controls;
 using Microsoft.Practices.Prism.Regions;
-using System.ComponentModel;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.PropertyGrid.Views
 {
-    /// <summary>
-    /// Interaction logic for BindingToStructs.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class BindingToStructs : DemoView
+  /// <summary>
+  /// Interaction logic for BindingToStructs.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class BindingToStructs : DemoView
+  {
+    public BindingToStructs()
     {
-        public BindingToStructs()
-        {
-            InitializeComponent();
-            _propertyGrid.SelectedObject = Person.CreatePerson();
-        }
-
-        public class Person
-        {
-            [Category("Information")]
-            [DisplayName("First Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            public string FirstName { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Last Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            public string LastName { get; set; }
-
-            public Dimension Dimensions { get; set; }
-
-            public static Person CreatePerson()
-            {
-                var person = new Person();
-                person.FirstName = "John";
-                person.LastName = "Doe";
-                person.Dimensions = new Dimension() { Height = 75.0, Weight = 185.76 };
-                return person;
-            }
-        }
+      InitializeComponent();
+      _propertyGrid.SelectedObject = Person.CreatePerson();
     }
 
-    public struct Dimension
+    public class Person
     {
-        public double Height;
-        public double Weight;
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
 
-        public Dimension(double height, double weight)
+      public Dimension Dimensions
+      {
+        get;
+        set;
+      }
+
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.Dimensions = new Dimension()
         {
-            this.Height = height;
-            this.Weight = weight;
-        }
+          Height = 75.0,
+          Weight = 185.76
+        };
+        return person;
+      }
     }
+  }
+
+  public struct Dimension
+  {
+    public double Height;
+    public double Weight;
 
-    public class DimensionsConverter : IValueConverter
+    public Dimension( double height, double weight )
     {
-        static Dimension _originalValue; // the static struct that stores original value at the start of editing
+      this.Height = height;
+      this.Weight = weight;
+    }
+  }
 
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            _originalValue = ((Dimension)value);
+  public class DimensionsConverter : IValueConverter
+  {
+    static Dimension _originalValue; // the static struct that stores original value at the start of editing
 
-            if (parameter.ToString() == "Height")
-                return ((Dimension)value).Height;
-            if (parameter.ToString() == "Weight")
-                return ((Dimension)value).Weight;
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      _originalValue = ( ( Dimension )value );
 
-            return _originalValue;
-        }
+      if( parameter.ToString() == "Height" )
+        return ( ( Dimension )value ).Height;
+      if( parameter.ToString() == "Weight" )
+        return ( ( Dimension )value ).Weight;
 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (parameter.ToString() == "Height")
-                _originalValue = new Dimension(double.Parse(value.ToString()), _originalValue.Weight);
-            if (parameter.ToString() == "Weight")
-                _originalValue = new Dimension(_originalValue.Height, double.Parse(value.ToString()));
+      return _originalValue;
+    }
 
-            return _originalValue;
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( parameter.ToString() == "Height" )
+        _originalValue = new Dimension( double.Parse( value.ToString() ), _originalValue.Weight );
+      if( parameter.ToString() == "Weight" )
+        _originalValue = new Dimension( _originalValue.Height, double.Parse( value.ToString() ) );
 
-        }
+      return _originalValue;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml
index d359c568..8a3dac45 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml
@@ -1,70 +1,89 @@
-<infControls:DemoView x:Class="Samples.Modules.PropertyGrid.Views.CustomEditors"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.PropertyGrid.Views.CustomEditors"
+                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                      xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       xmlns:sys="clr-namespace:System;assembly=mscorlib"
                       Title="Custom Editors">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="This example demonstrates the various methods of creating and using custom editors.  You can supply your own editor based on a Type, a property name, or both.  To supply your own editor for a property you have to create an EditorDefinition for the PropertyGrid."
+                 TextWrapping="Wrap" />
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Custom Editors with a DataTemplate:" Style="{StaticResource Header}" />
+         <TextBlock Text="You can override the default editors with your own custom editors with a DataTemplate.  Simply define an EditorDefinition that either targets a Type, property name, or both and set the EditorDefinition.EditorTemplate to an instance of a DataTemplate.  Be sure to bind your custom editor to the bound property item's Value property." TextWrapping="Wrap" />
+         <extToolkit:PropertyGrid x:Name="_propertyGrid1" Width="450"  Margin="10">
+            <extToolkit:PropertyGrid.EditorDefinitions>
+
+               <!-- This EditorDefinition will provide a TextBox to any property that is of type HorizontalAlignment, replacing the default ComboBox editor. -->
+               <extToolkit:EditorDefinition TargetType="{x:Type HorizontalAlignment}">
+                  <extToolkit:EditorDefinition.EditorTemplate>
+                     <DataTemplate>
+                        <TextBox Background="Green"  Text="{Binding Value}" />
+                        <!-- Always bind your editor's value to the bound property's Value -->
+                     </DataTemplate>
+                  </extToolkit:EditorDefinition.EditorTemplate>
+               </extToolkit:EditorDefinition>
+
+               <!-- This EditorDefinition will provide a TextBlock to any property that has any of the defined property names, replacing the default editor. -->
+               <extToolkit:EditorDefinition>
+                  <extToolkit:EditorDefinition.PropertiesDefinitions>
+                     <extToolkit:PropertyDefinition Name="Age" />
+                     <extToolkit:PropertyDefinition Name="WritingFont" />
+                     <extToolkit:PropertyDefinition Name="Spouse" />
+                  </extToolkit:EditorDefinition.PropertiesDefinitions>
+                  <extToolkit:EditorDefinition.EditorTemplate>
+                     <DataTemplate>
+                        <TextBlock Background="Yellow" Text="{Binding Value}" />
+                     </DataTemplate>
+                  </extToolkit:EditorDefinition.EditorTemplate>
+               </extToolkit:EditorDefinition>
 
-        <TextBlock Text="This example demonstrates the various methods of creating and using custom editors.  You can supply your own editor based on a Type, a property name, or both.  To supply your own editor for a property you have to create an EditorDefinition for the PropertyGrid."
-                   TextWrapping="Wrap" />
+               <!-- This EditorDefinition will provide a TextBox to any property that is of type Boolean and that has any of the defined property names, replacing the default editor. -->
+               <extToolkit:EditorDefinition TargetType="{x:Type sys:Boolean}">
+                  <extToolkit:EditorDefinition.PropertiesDefinitions>
+                     <extToolkit:PropertyDefinition Name="DateOfBirth" />
+                     <extToolkit:PropertyDefinition Name="LastName" />
+                  </extToolkit:EditorDefinition.PropertiesDefinitions>
+                  <extToolkit:EditorDefinition.EditorTemplate>
+                     <DataTemplate>
+                        <TextBox Background="Red" Text="{Binding Value}" />
+                     </DataTemplate>
+                  </extToolkit:EditorDefinition.EditorTemplate>
+               </extToolkit:EditorDefinition>
 
-        <StackPanel Grid.Row="1" Margin="10">
-            <TextBlock Text="Custom Editors with a DataTemplate:" Style="{StaticResource Header}" />
-            <TextBlock Text="You can override the default editors with your own custom editors with a DataTemplate.  Simply define an EditorDefinition that either targets a Type, property name, or both and set the EditorDefinition.EditorTemplate to an instance of a DataTemplate.  Be sure to bind your custom editor to the bound property item's Value property." TextWrapping="Wrap"/>
-            <extToolkit:PropertyGrid x:Name="_propertyGrid1" Width="450"  Margin="10">
-                <extToolkit:PropertyGrid.EditorDefinitions>
-                    
-                    <!-- This EditorDefinition will provide a TextBox to any property that is of type HorizontalAlignment, replacing the default ComboBox editor. -->
-                    <extToolkit:EditorDefinition TargetType="{x:Type HorizontalAlignment}">
-                        <extToolkit:EditorDefinition.EditorTemplate>
-                            <DataTemplate>
-                                <TextBox Background="Green"  Text="{Binding Value}" /> <!-- Always bind your editor's value to the bound property's Value -->
-                            </DataTemplate>
-                        </extToolkit:EditorDefinition.EditorTemplate>
-                    </extToolkit:EditorDefinition>
-                    
-                    <!-- This EditorDefinition will provide a TextBlock to any property that has any of the defined property names, replacing the default editor. -->
-                    <extToolkit:EditorDefinition>
-                        <extToolkit:EditorDefinition.PropertiesDefinitions>
-                            <extToolkit:PropertyDefinition Name="Age" />
-                            <extToolkit:PropertyDefinition Name="WritingFont" />
-                            <extToolkit:PropertyDefinition Name="Spouse" />
-                        </extToolkit:EditorDefinition.PropertiesDefinitions>
-                        <extToolkit:EditorDefinition.EditorTemplate>
-                            <DataTemplate>
-                                <TextBlock Background="Yellow"  Text="{Binding Value}" />
-                            </DataTemplate>
-                        </extToolkit:EditorDefinition.EditorTemplate>
-                    </extToolkit:EditorDefinition>
-                    
-                    <!-- This EditorDefinition will provide a TextBox to any property that is of type Boolean and that has any of the defined property names, replacing the default editor. -->
-                    <extToolkit:EditorDefinition TargetType="{x:Type sys:Boolean}">
-                        <extToolkit:EditorDefinition.PropertiesDefinitions>
-                            <extToolkit:PropertyDefinition Name="DateOfBirth" />
-                            <extToolkit:PropertyDefinition Name="LastName" />
-                        </extToolkit:EditorDefinition.PropertiesDefinitions>
-                        <extToolkit:EditorDefinition.EditorTemplate>
-                            <DataTemplate>
-                                <TextBox Background="Red"  Text="{Binding Value}" />
-                            </DataTemplate>
-                        </extToolkit:EditorDefinition.EditorTemplate>
-                    </extToolkit:EditorDefinition>
-                    
-                </extToolkit:PropertyGrid.EditorDefinitions>
-            </extToolkit:PropertyGrid>
-        </StackPanel>
+            </extToolkit:PropertyGrid.EditorDefinitions>
+         </extToolkit:PropertyGrid>
+      </StackPanel>
 
-        <StackPanel Grid.Row="2" Margin="10">
-            <TextBlock Text="Custom Editors with an Attribute:" Style="{StaticResource Header}" />
-            <TextBlock Text="You can supply editors for a property by using the System.ComponentModel.EditorAttribute.  In order to provide an editor with an attribute, the editor MUST implement the ITypeEditor interface.  Your editor can be a simple class or a complex UserControl." TextWrapping="Wrap"  />
-            <extToolkit:PropertyGrid x:Name="_propertyGrid2" Width="450" Margin="10"/>
-        </StackPanel>
-    </Grid>
+      <StackPanel Grid.Row="2" Margin="10">
+         <TextBlock Text="Custom Editors with an Attribute:" Style="{StaticResource Header}" />
+         <TextBlock Text="You can supply editors for a property by using the System.ComponentModel.EditorAttribute.  In order to provide an editor with an attribute, the editor MUST implement the ITypeEditor interface.  Your editor can be a simple class or a complex UserControl." TextWrapping="Wrap" />
+         <extToolkit:PropertyGrid x:Name="_propertyGrid2" Width="450" Margin="10" />
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml.cs
index 5fa14b83..f164fe4d 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomEditors.xaml.cs
@@ -1,159 +1,245 @@
-using Samples.Infrastructure.Controls;
-using System.ComponentModel;
-using System.Collections.Generic;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Windows;
-using System.Windows.Media;
 using System.Windows.Controls;
 using System.Windows.Data;
+using System.Windows.Media;
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.PropertyGrid.Views
 {
-    /// <summary>
-    /// Interaction logic for CustomEditors.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class CustomEditors : DemoView
+  /// <summary>
+  /// Interaction logic for CustomEditors.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class CustomEditors : DemoView
+  {
+    public CustomEditors()
     {
-        public CustomEditors()
-        {
-            InitializeComponent();
-            _propertyGrid1.SelectedObject = Person.CreatePerson();
-            _propertyGrid2.SelectedObject = CustomAttributEditorPerson.CreateCustomAttributEditorPerson();
-        }
+      InitializeComponent();
+      _propertyGrid1.SelectedObject = Person.CreatePerson();
+      _propertyGrid2.SelectedObject = CustomAttributEditorPerson.CreateCustomAttributEditorPerson();
+    }
 
-        public class Person
-        {
-            [Category("Information")]
-            [DisplayName("First Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            public string FirstName { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Last Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            public string LastName { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Date of Birth")]
-            [Description("This property uses the DateTimeUpDown as the default editor.")]
-            public DateTime DateOfBirth { get; set; }
-
-            [DisplayName("Grade Point Average")]
-            [Description("This property uses the DoubleUpDown as the default editor.")]
-            public double GradePointAvg { get; set; }
-
-            [Category("Information")]
-            [Description("This property uses the IntegerUpDown as the default editor.")]
-            public int Age { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Is Male")]
-            [Description("This property uses a CheckBox as the default editor.")]
-            public bool IsMale { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Favorite Color")]
-            [Description("This property uses the ColorPicker as the default editor.")]
-            public Color FavoriteColor { get; set; }
-
-            [Category("Writing")]
-            [DisplayName("Writing Hand")]
-            [Description("This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values")]
-            public HorizontalAlignment WritingHand { get; set; }
-
-            [Category("Writing")]
-            [DisplayName("Writing Font")]
-            [Description("This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values")]
-            public FontFamily WritingFont { get; set; }
-
-            [Category("Writing")]
-            [DisplayName("Writing Font Size")]
-            [Description("This property uses the DoubleUpDown as the default editor.")]
-            public double WritingFontSize { get; set; }
-
-            [Category("Conections")]
-            [DisplayName("Pet Names")]
-            [Description("This property uses the PrimitiveTypeCollectionEditor as the default editor.")]
-            public List<String> PetNames { get; set; }
-
-            [Category("Conections")]
-            [Description("This property uses the CollectionEditor as the default editor.")]
-            public List<Person> Friends { get; set; }
-
-            [Category("Conections")]
-            [Description("This property is a complex property and has no default editor.")]
-            public Person Spouse { get; set; }
-
-            public static Person CreatePerson()
-            {
-                var person = new Person();
-                person.FirstName = "John";
-                person.LastName = "Doe";
-                person.DateOfBirth = new DateTime(1975, 1, 23);
-                person.Age = DateTime.Today.Year - person.DateOfBirth.Year;
-                person.GradePointAvg = 3.98;
-                person.IsMale = true;
-                person.FavoriteColor = Colors.Blue;
-                person.WritingHand = System.Windows.HorizontalAlignment.Right;
-                person.WritingFont = new FontFamily("Arial");
-                person.WritingFontSize = 12.5;
-                person.PetNames = new List<string>() { "Pet 1", "Pet 2", "Pet 3" };
-                person.Friends = new List<Person>() { new Person() { FirstName = "First", LastName = "Friend" }, new Person() { FirstName = "Second", LastName = "Friend" } };
-                person.Spouse = new Person() { FirstName = "Jane", LastName = "Doe" };
-                return person;
-            }
-        }
-
-        public class CustomAttributEditorPerson
+    public class Person
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Date of Birth" )]
+      [Description( "This property uses the DateTimeUpDown as the default editor." )]
+      public DateTime DateOfBirth
+      {
+        get;
+        set;
+      }
+
+      [DisplayName( "Grade Point Average" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double GradePointAvg
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [Description( "This property uses the IntegerUpDown as the default editor." )]
+      public int Age
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Is Male" )]
+      [Description( "This property uses a CheckBox as the default editor." )]
+      public bool IsMale
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Favorite Color" )]
+      [Description( "This property uses the ColorPicker as the default editor." )]
+      public Color FavoriteColor
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Hand" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public HorizontalAlignment WritingHand
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public FontFamily WritingFont
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font Size" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double WritingFontSize
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [DisplayName( "Pet Names" )]
+      [Description( "This property uses the PrimitiveTypeCollectionEditor as the default editor." )]
+      public List<String> PetNames
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property uses the CollectionEditor as the default editor." )]
+      public List<Person> Friends
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property is a complex property and has no default editor." )]
+      public Person Spouse
+      {
+        get;
+        set;
+      }
+
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.DateOfBirth = new DateTime( 1975, 1, 23 );
+        person.Age = DateTime.Today.Year - person.DateOfBirth.Year;
+        person.GradePointAvg = 3.98;
+        person.IsMale = true;
+        person.FavoriteColor = Colors.Blue;
+        person.WritingHand = System.Windows.HorizontalAlignment.Right;
+        person.WritingFont = new FontFamily( "Arial" );
+        person.WritingFontSize = 12.5;
+        person.PetNames = new List<string>() { "Pet 1", "Pet 2", "Pet 3" };
+        person.Friends = new List<Person>() { new Person() { FirstName = "First", LastName = "Friend" }, new Person() { FirstName = "Second", LastName = "Friend" } };
+        person.Spouse = new Person()
         {
-            [Category("Information")]
-            [DisplayName("First Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            //This custom editor is a Class that implements the ITypeEditor interface
-            [Editor(typeof(FirstNameEditor), typeof(FirstNameEditor))]
-            public string FirstName { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Last Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            //This custom editor is a UserControl that implements the ITypeEditor interface
-            [Editor(typeof(LastNameUserControlEditor), typeof(LastNameUserControlEditor))]
-            public string LastName { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Date of Birth")]
-            [Description("This property uses the DateTimeUpDown as the default editor.")]
-            public DateTime DateOfBirth { get; set; }
-
-            public static CustomAttributEditorPerson CreateCustomAttributEditorPerson()
-            {
-                var person = new CustomAttributEditorPerson();
-                person.FirstName = "John";
-                person.LastName = "Doe";
-                person.DateOfBirth = new DateTime(1975, 1, 23);
-                return person;
-            }
-        }
+          FirstName = "Jane",
+          LastName = "Doe"
+        };
+        return person;
+      }
     }
 
-    //Custom editors that are used as attributes MUST implement the ITypeEditor interface.
-    public class FirstNameEditor : Microsoft.Windows.Controls.PropertyGrid.Editors.ITypeEditor
+    public class CustomAttributEditorPerson
     {
-        public FrameworkElement ResolveEditor(Microsoft.Windows.Controls.PropertyGrid.PropertyItem propertyItem)
-        {
-            TextBox textBox = new TextBox();
-            textBox.Background = new SolidColorBrush(Colors.Red);
-
-            //create the binding from the bound property item to the editor
-            var _binding = new Binding("Value"); //bind to the Value property of the PropertyItem
-            _binding.Source = propertyItem;
-            _binding.ValidatesOnExceptions = true;
-            _binding.ValidatesOnDataErrors = true;
-            _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
-            BindingOperations.SetBinding(textBox, TextBox.TextProperty, _binding);
-            return textBox;
-        }
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      //This custom editor is a Class that implements the ITypeEditor interface
+      [Editor( typeof( FirstNameEditor ), typeof( FirstNameEditor ) )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      //This custom editor is a UserControl that implements the ITypeEditor interface
+      [Editor( typeof( LastNameUserControlEditor ), typeof( LastNameUserControlEditor ) )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Date of Birth" )]
+      [Description( "This property uses the DateTimeUpDown as the default editor." )]
+      public DateTime DateOfBirth
+      {
+        get;
+        set;
+      }
+
+      public static CustomAttributEditorPerson CreateCustomAttributEditorPerson()
+      {
+        var person = new CustomAttributEditorPerson();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.DateOfBirth = new DateTime( 1975, 1, 23 );
+        return person;
+      }
+    }
+  }
+
+  //Custom editors that are used as attributes MUST implement the ITypeEditor interface.
+  public class FirstNameEditor : Microsoft.Windows.Controls.PropertyGrid.Editors.ITypeEditor
+  {
+    public FrameworkElement ResolveEditor( Microsoft.Windows.Controls.PropertyGrid.PropertyItem propertyItem )
+    {
+      TextBox textBox = new TextBox();
+      textBox.Background = new SolidColorBrush( Colors.Red );
+
+      //create the binding from the bound property item to the editor
+      var _binding = new Binding( "Value" ); //bind to the Value property of the PropertyItem
+      _binding.Source = propertyItem;
+      _binding.ValidatesOnExceptions = true;
+      _binding.ValidatesOnDataErrors = true;
+      _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+      BindingOperations.SetBinding( textBox, TextBox.TextProperty, _binding );
+      return textBox;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml
index 56e7e5ae..f632c46a 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml
@@ -1,23 +1,41 @@
-<infControls:DemoView x:Class="Samples.Modules.PropertyGrid.Views.CustomItemsSource"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.PropertyGrid.Views.CustomItemsSource"
+                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                      xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="Custom ItemsSource">
-    <Grid>
-
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="Sometimes it is desirable to want to provide a collection of values represented by a ComboBox for a given property.  The PropertyGrid supports this scenario by create a class that implements IItemsSource and decorating your property with the ItemsSourceAttribute."
-                   TextWrapping="Wrap" />
-
-        <StackPanel Grid.Row="1" Margin="10">
-            <TextBlock Text="Providing a Custom ItemsSource:" Style="{StaticResource Header}" />
-            <TextBlock Text="This example uses a collection of Doubles to represent the available options for the WritingFontSize property." TextWrapping="Wrap"/>
-            <extToolkit:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10"/>
-        </StackPanel>
-    </Grid>
-    </infControls:DemoView>
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="Sometimes it is desirable to want to provide a collection of values represented by a ComboBox for a given property.  The PropertyGrid supports this scenario by create a class that implements IItemsSource and decorating your property with the ItemsSourceAttribute."
+                 TextWrapping="Wrap" />
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Providing a Custom ItemsSource:" Style="{StaticResource Header}" />
+         <TextBlock Text="This example uses a collection of Doubles to represent the available options for the WritingFontSize property." TextWrapping="Wrap" />
+         <extToolkit:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10" />
+      </StackPanel>
+   </Grid>
+</infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml.cs
index 884c605f..d51500a9 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/CustomItemsSource.xaml.cs
@@ -1,4 +1,22 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.ComponentModel;
 using System.Windows;
 using System.Windows.Media;
@@ -8,87 +26,111 @@ using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.PropertyGrid.Views
 {
-    /// <summary>
-    /// Interaction logic for CustomItemsSource.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class CustomItemsSource : DemoView
+  /// <summary>
+  /// Interaction logic for CustomItemsSource.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class CustomItemsSource : DemoView
+  {
+    public CustomItemsSource()
     {
-        public CustomItemsSource()
-        {
-            InitializeComponent();
-            _propertyGrid.SelectedObject = Person.CreatePerson();
-        }
+      InitializeComponent();
+      _propertyGrid.SelectedObject = Person.CreatePerson();
+    }
 
-        public class Person
-        {
-            [Category("Information")]
-            [DisplayName("First Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            public string FirstName { get; set; }
+    public class Person
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
 
-            [Category("Information")]
-            [DisplayName("Last Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            public string LastName { get; set; }
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
 
-            [Category("Information")]
-            [DisplayName("Date of Birth")]
-            [Description("This property uses the DateTimeUpDown as the default editor.")]
-            public DateTime DateOfBirth { get; set; }
+      [Category( "Information" )]
+      [DisplayName( "Date of Birth" )]
+      [Description( "This property uses the DateTimeUpDown as the default editor." )]
+      public DateTime DateOfBirth
+      {
+        get;
+        set;
+      }
 
-            [Category("Writing")]
-            [DisplayName("Writing Hand")]
-            [Description("This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values")]
-            public HorizontalAlignment WritingHand { get; set; }
+      [Category( "Writing" )]
+      [DisplayName( "Writing Hand" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public HorizontalAlignment WritingHand
+      {
+        get;
+        set;
+      }
 
-            [Category("Writing")]
-            [DisplayName("Writing Font")]
-            [Description("This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values")]
-            public FontFamily WritingFont { get; set; }
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public FontFamily WritingFont
+      {
+        get;
+        set;
+      }
 
-            [Category("Writing")]
-            [DisplayName("Writing Font Size")]
-            [Description("This property uses the DoubleUpDown as the default editor.")]
-            [ItemsSource(typeof(FontSizeItemsSource))]
-            public double WritingFontSize { get; set; }
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font Size" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      [ItemsSource( typeof( FontSizeItemsSource ) )]
+      public double WritingFontSize
+      {
+        get;
+        set;
+      }
 
-            public static Person CreatePerson()
-            {
-                var person = new Person();
-                person.FirstName = "John";
-                person.LastName = "Doe";
-                person.DateOfBirth = new DateTime(1975, 1, 23);
-                person.WritingHand = System.Windows.HorizontalAlignment.Right;
-                person.WritingFont = new FontFamily("Arial");
-                person.WritingFontSize = 12.0;
-                return person;
-            }
-        }
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.DateOfBirth = new DateTime( 1975, 1, 23 );
+        person.WritingHand = System.Windows.HorizontalAlignment.Right;
+        person.WritingFont = new FontFamily( "Arial" );
+        person.WritingFontSize = 12.0;
+        return person;
+      }
     }
+  }
 
-    public class FontSizeItemsSource : IItemsSource
+  public class FontSizeItemsSource : IItemsSource
+  {
+    public ItemCollection GetValues()
     {
-        public ItemCollection GetValues()
-        {
-            ItemCollection sizes = new ItemCollection();
-            sizes.Add(5.0, "Five");
-            sizes.Add(5.5);
-            sizes.Add(6.0, "Six");
-            sizes.Add(6.5);
-            sizes.Add(7.0, "Seven");
-            sizes.Add(7.5);
-            sizes.Add(8.0, "Eight");
-            sizes.Add(8.5);
-            sizes.Add(9.0, "Nine");
-            sizes.Add(9.5);
-            sizes.Add(10.0);
-            sizes.Add(12.0, "Twelve");
-            sizes.Add(14.0);
-            sizes.Add(16.0);
-            sizes.Add(18.0);
-            sizes.Add(20.0);
-            return sizes;
-        }
+      ItemCollection sizes = new ItemCollection();
+      sizes.Add( 5.0, "Five" );
+      sizes.Add( 5.5 );
+      sizes.Add( 6.0, "Six" );
+      sizes.Add( 6.5 );
+      sizes.Add( 7.0, "Seven" );
+      sizes.Add( 7.5 );
+      sizes.Add( 8.0, "Eight" );
+      sizes.Add( 8.5 );
+      sizes.Add( 9.0, "Nine" );
+      sizes.Add( 9.5 );
+      sizes.Add( 10.0 );
+      sizes.Add( 12.0, "Twelve" );
+      sizes.Add( 14.0 );
+      sizes.Add( 16.0 );
+      sizes.Add( 18.0 );
+      sizes.Add( 20.0 );
+      return sizes;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml
index 254903ff..3d2d46c3 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml
@@ -1,21 +1,39 @@
-<infControls:DemoView x:Class="Samples.Modules.PropertyGrid.Views.DefaultEditors"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-            xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.PropertyGrid.Views.DefaultEditors"
+                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                      xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="Default Editors">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="This example demonstrates the default editors provided by the PropertyGrid."
-                   TextWrapping="Wrap" />
-
-        <StackPanel Grid.Row="1" Margin="10">
-            <TextBlock Text="Default Editors:" Style="{StaticResource Header}" />
-            <extToolkit:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10"/>
-        </StackPanel>
-    </Grid>
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="This example demonstrates the default editors provided by the PropertyGrid."
+                 TextWrapping="Wrap" />
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Default Editors:" Style="{StaticResource Header}" />
+         <extToolkit:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10" />
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml.cs
index 8429e214..88bcb9eb 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/DefaultEditors.xaml.cs
@@ -1,106 +1,180 @@
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System;
 using System.Collections.Generic;
-using System.Windows.Media;
 using System.ComponentModel;
 using System.Windows;
+using System.Windows.Media;
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.PropertyGrid.Views
 {
-    /// <summary>
-    /// Interaction logic for DefaultEditors.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class DefaultEditors : DemoView
+  /// <summary>
+  /// Interaction logic for DefaultEditors.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class DefaultEditors : DemoView
+  {
+    public DefaultEditors()
     {
-        public DefaultEditors()
-        {
-            InitializeComponent();
-            _propertyGrid.SelectedObject = Person.CreatePerson();
-        }
+      InitializeComponent();
+      _propertyGrid.SelectedObject = Person.CreatePerson();
+    }
+
+    public class Person
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Date of Birth" )]
+      [Description( "This property uses the DateTimeUpDown as the default editor." )]
+      public DateTime DateOfBirth
+      {
+        get;
+        set;
+      }
+
+      [DisplayName( "Grade Point Average" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double GradePointAvg
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [Description( "This property uses the IntegerUpDown as the default editor." )]
+      public int Age
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Is Male" )]
+      [Description( "This property uses a CheckBox as the default editor." )]
+      public bool IsMale
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Favorite Color" )]
+      [Description( "This property uses the ColorPicker as the default editor." )]
+      public Color FavoriteColor
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Hand" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public HorizontalAlignment WritingHand
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public FontFamily WritingFont
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font Size" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double WritingFontSize
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [DisplayName( "Pet Names" )]
+      [Description( "This property uses the PrimitiveTypeCollectionEditor as the default editor." )]
+      public List<String> PetNames
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property uses the CollectionEditor as the default editor." )]
+      public List<Person> Friends
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property is a complex property and has no default editor." )]
+      public Person Spouse
+      {
+        get;
+        set;
+      }
 
-        public class Person
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.DateOfBirth = new DateTime( 1975, 1, 23 );
+        person.Age = DateTime.Today.Year - person.DateOfBirth.Year;
+        person.GradePointAvg = 3.98;
+        person.IsMale = true;
+        person.FavoriteColor = Colors.Blue;
+        person.WritingHand = System.Windows.HorizontalAlignment.Right;
+        person.WritingFont = new FontFamily( "Arial" );
+        person.WritingFontSize = 12.5;
+        person.PetNames = new List<string>() { "Pet 1", "Pet 2", "Pet 3" };
+        person.Friends = new List<Person>() { new Person() { FirstName = "First", LastName = "Friend" }, new Person() { FirstName = "Second", LastName = "Friend" } };
+        person.Spouse = new Person()
         {
-            [Category("Information")]
-            [DisplayName("First Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            public string FirstName { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Last Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            public string LastName { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Date of Birth")]
-            [Description("This property uses the DateTimeUpDown as the default editor.")]
-            public DateTime DateOfBirth { get; set; }
-
-            [DisplayName("Grade Point Average")]
-            [Description("This property uses the DoubleUpDown as the default editor.")]
-            public double GradePointAvg { get; set; }
-
-            [Category("Information")]
-            [Description("This property uses the IntegerUpDown as the default editor.")]
-            public int Age { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Is Male")]
-            [Description("This property uses a CheckBox as the default editor.")]
-            public bool IsMale { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Favorite Color")]
-            [Description("This property uses the ColorPicker as the default editor.")]
-            public Color FavoriteColor { get; set; }
-
-            [Category("Writing")]
-            [DisplayName("Writing Hand")]
-            [Description("This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values")]
-            public HorizontalAlignment WritingHand { get; set; }
-
-            [Category("Writing")]
-            [DisplayName("Writing Font")]
-            [Description("This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values")]
-            public FontFamily WritingFont { get; set; }
-
-            [Category("Writing")]
-            [DisplayName("Writing Font Size")]
-            [Description("This property uses the DoubleUpDown as the default editor.")]
-            public double WritingFontSize { get; set; }
-
-            [Category("Conections")]
-            [DisplayName("Pet Names")]
-            [Description("This property uses the PrimitiveTypeCollectionEditor as the default editor.")]
-            public List<String> PetNames { get; set; }
-
-            [Category("Conections")]
-            [Description("This property uses the CollectionEditor as the default editor.")]
-            public List<Person> Friends { get; set; }
-
-            [Category("Conections")]
-            [Description("This property is a complex property and has no default editor.")]
-            public Person Spouse { get; set; }
-
-            public static Person CreatePerson()
-            {
-                var person = new Person();
-                person.FirstName = "John";
-                person.LastName = "Doe";
-                person.DateOfBirth = new DateTime(1975, 1, 23);
-                person.Age = DateTime.Today.Year - person.DateOfBirth.Year;
-                person.GradePointAvg = 3.98;
-                person.IsMale = true;
-                person.FavoriteColor = Colors.Blue;
-                person.WritingHand = System.Windows.HorizontalAlignment.Right;
-                person.WritingFont = new FontFamily("Arial");
-                person.WritingFontSize = 12.5;
-                person.PetNames = new List<string>() { "Pet 1", "Pet 2", "Pet 3" };
-                person.Friends = new List<Person>() { new Person() { FirstName = "First", LastName = "Friend" }, new Person() { FirstName = "Second", LastName = "Friend" } };
-                person.Spouse = new Person() { FirstName = "Jane", LastName = "Doe" };
-                return person;
-            }
-        }
+          FirstName = "Jane",
+          LastName = "Doe"
+        };
+        return person;
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml
index a9d0f8aa..35c85db9 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml
@@ -1,23 +1,41 @@
-<infControls:DemoView x:Class="Samples.Modules.PropertyGrid.Views.ExpandableProperties"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.PropertyGrid.Views.ExpandableProperties"
+                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                      xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="Exandable Properties">
-    <Grid>
-
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="Sometimes it is neccessary to show the properties of a complex object.  The PropertyGrid supports this scenario and allows you to drill down into a property's heirarchy.  To enable this behavior you must decorate your property with the ExpandableObject attribute."
-                   TextWrapping="Wrap" />
-
-        <StackPanel Grid.Row="1" Margin="10">
-            <TextBlock Text="Expandable Properties:" Style="{StaticResource Header}" />
-            <TextBlock Text="In this example the Spouse property has been decorated with the ExpandableObject attribute.  Notice how you can drill down into the Spouse properties." TextWrapping="Wrap" />
-            <extToolkit:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10"  />
-        </StackPanel>
-    </Grid>
-    </infControls:DemoView>
\ No newline at end of file
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="Sometimes it is neccessary to show the properties of a complex object.  The PropertyGrid supports this scenario and allows you to drill down into a property's heirarchy.  To enable this behavior you must decorate your property with the ExpandableObject attribute."
+                 TextWrapping="Wrap" />
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Expandable Properties:" Style="{StaticResource Header}" />
+         <TextBlock Text="In this example the Spouse property has been decorated with the ExpandableObject attribute.  Notice how you can drill down into the Spouse properties." TextWrapping="Wrap" />
+         <extToolkit:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10"  />
+      </StackPanel>
+   </Grid>
+</infControls:DemoView>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml.cs
index 8012ff47..dc1d2a7e 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/ExpandableProperties.xaml.cs
@@ -1,62 +1,101 @@
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.ComponentModel;
-using System.Collections.Generic;
-using System;
 using System.Windows.Media;
-using System.Windows;
 using Microsoft.Windows.Controls.PropertyGrid.Attributes;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.PropertyGrid.Views
 {
-    /// <summary>
-    /// Interaction logic for ExpandableProperties.xaml
-    /// </summary>
-    public partial class ExpandableProperties : DemoView
+  /// <summary>
+  /// Interaction logic for ExpandableProperties.xaml
+  /// </summary>
+  public partial class ExpandableProperties : DemoView
+  {
+    public ExpandableProperties()
     {
-        public ExpandableProperties()
-        {
-            InitializeComponent();
-            _propertyGrid.SelectedObject = Person.CreatePerson();
-        }
+      InitializeComponent();
+      _propertyGrid.SelectedObject = Person.CreatePerson();
+    }
+
+    public class Person
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public FontFamily WritingFont
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font Size" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double WritingFontSize
+      {
+        get;
+        set;
+      }
+
+
+      [Category( "Conections" )]
+      [Description( "This property is a complex property and has no default editor." )]
+      [ExpandableObject]
+      public Person Spouse
+      {
+        get;
+        set;
+      }
 
-        public class Person
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.WritingFont = new FontFamily( "Arial" );
+        person.WritingFontSize = 12.5;
+        person.Spouse = new Person()
         {
-            [Category("Information")]
-            [DisplayName("First Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            public string FirstName { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Last Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            public string LastName { get; set; }
-
-            [Category("Writing")]
-            [DisplayName("Writing Font")]
-            [Description("This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values")]
-            public FontFamily WritingFont { get; set; }
-
-            [Category("Writing")]
-            [DisplayName("Writing Font Size")]
-            [Description("This property uses the DoubleUpDown as the default editor.")]
-            public double WritingFontSize { get; set; }
-
-
-            [Category("Conections")]
-            [Description("This property is a complex property and has no default editor.")]
-            [ExpandableObject]
-            public Person Spouse { get; set; }
-
-            public static Person CreatePerson()
-            {
-                var person = new Person();
-                person.FirstName = "John";
-                person.LastName = "Doe";
-                person.WritingFont = new FontFamily("Arial");
-                person.WritingFontSize = 12.5;
-                person.Spouse = new Person() { FirstName = "Jane", LastName = "Doe" };
-                return person;
-            }
-        }
+          FirstName = "Jane",
+          LastName = "Doe"
+        };
+        return person;
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml
index b9644796..708c59a5 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml
@@ -1,68 +1,87 @@
-<infControls:DemoView x:Class="Samples.Modules.PropertyGrid.Views.HomeView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.PropertyGrid.Views.HomeView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"  
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="PropertyGrid" >
-<Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*"/>
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="The PropertyGrid control allows you inspect and edit properties of an object.  This PropertyGrid allows you do autogenerate all properties or specify the specific properties you want to display.  You can use the standard editors that are provided with the PropertyGrid or you can use custom editors that target a Type, specific properties, or both.  The PropertyGrid also supports complex properties, which allows you to drill down into a nested property hierarchy."
+                 TextWrapping="Wrap" />
+
+      <GroupBox Header="Features" Grid.Row="1" Margin="5">
+         <Grid Margin="5">
+            <Grid.RowDefinitions>
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+            </Grid.RowDefinitions>
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
 
-        <TextBlock Text="The PropertyGrid control allows you inspect and edit properties of an object.  This PropertyGrid allows you do autogenerate all properties or specify the specific properties you want to display.  You can use the standard editors that are provided with the PropertyGrid or you can use custom editors that target a Type, specific properties, or both.  The PropertyGrid also supports complex properties, which allows you to drill down into a nested property hierarchy."
-                   TextWrapping="Wrap" />
+            <TextBlock Text="Display Sumary:" VerticalAlignment="Center" />
+            <CheckBox x:Name="_displaySummary" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the summary panel of the PropertyGrid." />
 
-        <GroupBox Header="Features" Grid.Row="1" Margin="5"  >
-            <Grid Margin="5">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                </Grid.RowDefinitions>
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
+            <TextBlock Text="Filter:" VerticalAlignment="Center" Grid.Row="1" />
+            <extToolkit:WatermarkTextBox x:Name="_filter" 
+                                         Grid.Row="1" 
+                                         Grid.Column="1"
+                                         Watermark="Search" 
+                                         VerticalAlignment="Center" Margin="5" ToolTip="Filters the properties within the PropertyGrid." />
 
-                <TextBlock Text="Display Sumary:" VerticalAlignment="Center" />
-                <CheckBox x:Name="_displaySummary" Grid.Column="1" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the summary panel of the PropertyGrid."/>
+            <TextBlock Text="Is Categorized:" VerticalAlignment="Center" Grid.Column="2" />
+            <CheckBox x:Name="_isCategorized" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Gets/Sets the layout of the PropertyGrid." />
 
-                <TextBlock Text="Filter:" VerticalAlignment="Center" Grid.Row="1" />
-                <extToolkit:WatermarkTextBox x:Name="_filter" Grid.Row="1" Grid.Column="1"
-                                             Watermark="Search" 
-                                             VerticalAlignment="Center" Margin="5" ToolTip="Filters the properties within the PropertyGrid."/>
+            <TextBlock Text="Show Advanced Options:" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2" />
+            <CheckBox x:Name="_showAdvancedOptions" Grid.Row="1" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the advanced options menu next to a property." />
+         </Grid>
+      </GroupBox>
 
-                <TextBlock Text="Is Categorized:" VerticalAlignment="Center" Grid.Column="2" />
-                <CheckBox x:Name="_isCategorized" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Gets/Sets the layout of the PropertyGrid."/>
+      <StackPanel Grid.Row="2" Margin="10">
+         <TextBlock Text="Usage:" Style="{StaticResource Header}" />
+         <TextBlock Text="To inspect an object simply set the PropertyGrid.SelectedObject property to an instance of the object you want to inspect."
+                       TextWrapping="Wrap" />
+         <Grid Height="400" Margin="10">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
 
-                <TextBlock Text="Show Advanced Options:" VerticalAlignment="Center" Grid.Row="1" Grid.Column="2" />
-                <CheckBox x:Name="_showAdvancedOptions" Grid.Row="1" Grid.Column="3" IsChecked="True" VerticalAlignment="Center" Margin="5" ToolTip="Shows/Hides the advanced options menu next to a property."/>
-            </Grid>
-        </GroupBox>
+            <Button x:Name="_button" Height="200" Width="200" Margin="25" HorizontalAlignment="Center" VerticalAlignment="Center">Inspect Me</Button>
 
-        <StackPanel Grid.Row="2" Margin="10">
-            <TextBlock Text="Usage:" Style="{StaticResource Header}" />
-            <TextBlock Text="To inspect an object simply set the PropertyGrid.SelectedObject property to an instance of the object you want to inspect."
-                       TextWrapping="Wrap"/>
-            <Grid Height="400" Margin="10"  >
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-                
-                <Button x:Name="_button" Height="200" Width="200" Margin="25" HorizontalAlignment="Center" VerticalAlignment="Center">Inspect Me</Button>
-                
-                <extToolkit:PropertyGrid Grid.Column="1"
-                                         DisplaySummary="{Binding IsChecked, ElementName=_displaySummary}"
-                                         Filter="{Binding Text, ElementName=_filter, Mode=TwoWay}"
-                                         IsCategorized="{Binding IsChecked, ElementName=_isCategorized, Mode=TwoWay}"
-                                         ShowAdvancedOptions="{Binding IsChecked, ElementName=_showAdvancedOptions}"
-                                         SelectedObject="{Binding ElementName=_button}"/>
-                
-            </Grid>
-        </StackPanel>
-    </Grid>
+            <extToolkit:PropertyGrid Grid.Column="1"
+                                     DisplaySummary="{Binding IsChecked, ElementName=_displaySummary}"
+                                     Filter="{Binding Text, ElementName=_filter, Mode=TwoWay}"
+                                     IsCategorized="{Binding IsChecked, ElementName=_isCategorized, Mode=TwoWay}"
+                                     ShowAdvancedOptions="{Binding IsChecked, ElementName=_showAdvancedOptions}"
+                                     SelectedObject="{Binding ElementName=_button}" />
+         </Grid>
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml.cs
index 3d54519d..4025210f 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/HomeView.xaml.cs
@@ -1,17 +1,35 @@
-using Microsoft.Practices.Prism.Regions;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using Microsoft.Practices.Prism.Regions;
 using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.PropertyGrid.Views
 {
-    /// <summary>
-    /// Interaction logic for HomeView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class HomeView : DemoView
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
     {
-        public HomeView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml
index d3b811c2..bdcc4fda 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml
@@ -1,22 +1,40 @@
-<TreeViewItem x:Class="Samples.Modules.PropertyGrid.Views.NavigationView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.PropertyGrid.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:views="clr-namespace:Samples.Modules.PropertyGrid.Views"
               Header="PropertyGrid" Tag="{x:Type views:HomeView}">
 
-    <TreeViewItem.Resources>
-        <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
-
-    <TreeViewItem Header="Editors">
-        <TreeViewItem Header="Default Editors" Tag="{x:Type views:DefaultEditors}"  />
-        <TreeViewItem Header="Custom Editors" Tag="{x:Type views:CustomEditors}"/>
-    </TreeViewItem>
-    <TreeViewItem Header="Properties">
-        <TreeViewItem Header="Binding to Structs" Tag="{x:Type views:BindingToStructs}"/>
-        <TreeViewItem Header="Expandable Properties" Tag="{x:Type views:ExpandableProperties}"/>
-        <TreeViewItem Header="Providing an ItemsSource" Tag="{x:Type views:CustomItemsSource}"/>
-        <TreeViewItem Header="Specifying Properties" Tag="{x:Type views:SpecifyingProperties}"/>
-    </TreeViewItem>
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+   <TreeViewItem Header="Editors">
+      <TreeViewItem Header="Default Editors" Tag="{x:Type views:DefaultEditors}" />
+      <TreeViewItem Header="Custom Editors" Tag="{x:Type views:CustomEditors}" />
+   </TreeViewItem>
+   <TreeViewItem Header="Properties">
+      <TreeViewItem Header="Binding to Structs" Tag="{x:Type views:BindingToStructs}" />
+      <TreeViewItem Header="Expandable Properties" Tag="{x:Type views:ExpandableProperties}" />
+      <TreeViewItem Header="Providing an ItemsSource" Tag="{x:Type views:CustomItemsSource}" />
+      <TreeViewItem Header="Specifying Properties" Tag="{x:Type views:SpecifyingProperties}" />
+   </TreeViewItem>
 
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml.cs
index 70fc1e1b..26b3d7f9 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/NavigationView.xaml.cs
@@ -1,27 +1,33 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.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 Samples.Modules.PropertyGrid.Views
 {
-    /// <summary>
-    /// Interaction logic for NavigationView.xaml
-    /// </summary>
-    public partial class NavigationView : TreeViewItem
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
     {
-        public NavigationView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml
index 7207719e..54d1d094 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml
@@ -1,30 +1,50 @@
-<infControls:DemoView x:Class="Samples.Modules.PropertyGrid.Views.SpecifyingProperties"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.PropertyGrid.Views.SpecifyingProperties"
+                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                      xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="Specifying Properties">
-    <Grid>
-
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="By default the propertyGrid will autogenerate all the properties for a given object.  You can override this behavior by setting the AutoGenerateProperties property to False, and then provide a collection of PropertyDefinitions of the properties you would like to show."
-                   TextWrapping="Wrap" />
-
-        <StackPanel Grid.Row="1" Margin="10">
-            <TextBlock Text="Specifying Properties:" Style="{StaticResource Header}" />
-            <extToolkit:PropertyGrid x:Name="_propertyGrid" Width="450" Margin="10"
-                                     AutoGenerateProperties="False">
-                <!-- Only the following properties will be displayed in the PropertyGrid -->
-                <extToolkit:PropertyGrid.PropertyDefinitions>
-                    <extToolkit:PropertyDefinition Name="FirstName" />
-                    <extToolkit:PropertyDefinition Name="FavoriteColor" />
-                    <extToolkit:PropertyDefinition Name="PetNames" />
-                </extToolkit:PropertyGrid.PropertyDefinitions>
-            </extToolkit:PropertyGrid>
-        </StackPanel>
-    </Grid>
-    </infControls:DemoView>
+   <Grid>
+
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="By default the propertyGrid will autogenerate all the properties for a given object.  You can override this behavior by setting the AutoGenerateProperties property to False, and then provide a collection of PropertyDefinitions of the properties you would like to show."
+                 TextWrapping="Wrap" />
+
+      <StackPanel Grid.Row="1" Margin="10">
+         <TextBlock Text="Specifying Properties:" Style="{StaticResource Header}" />
+         <extToolkit:PropertyGrid x:Name="_propertyGrid" 
+                                  Width="450" 
+                                  Margin="10"
+                                  AutoGenerateProperties="False">
+            <!-- Only the following properties will be displayed in the PropertyGrid -->
+            <extToolkit:PropertyGrid.PropertyDefinitions>
+               <extToolkit:PropertyDefinition Name="FirstName" />
+               <extToolkit:PropertyDefinition Name="FavoriteColor" />
+               <extToolkit:PropertyDefinition Name="PetNames" />
+            </extToolkit:PropertyGrid.PropertyDefinitions>
+         </extToolkit:PropertyGrid>
+      </StackPanel>
+   </Grid>
+</infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml.cs
index 25d3b2df..d3bbce55 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.PropertyGrid/Views/SpecifyingProperties.xaml.cs
@@ -1,106 +1,180 @@
-using Samples.Infrastructure.Controls;
-using System.ComponentModel;
-using System.Collections.Generic;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System;
-using System.Windows.Media;
+using System.Collections.Generic;
+using System.ComponentModel;
 using System.Windows;
+using System.Windows.Media;
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.PropertyGrid.Views
 {
-    /// <summary>
-    /// Interaction logic for SpecifyingProperties.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class SpecifyingProperties : DemoView
+  /// <summary>
+  /// Interaction logic for SpecifyingProperties.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class SpecifyingProperties : DemoView
+  {
+    public SpecifyingProperties()
     {
-        public SpecifyingProperties()
-        {
-            InitializeComponent();
-            _propertyGrid.SelectedObject = Person.CreatePerson();
-        }
+      InitializeComponent();
+      _propertyGrid.SelectedObject = Person.CreatePerson();
+    }
+
+    public class Person
+    {
+      [Category( "Information" )]
+      [DisplayName( "First Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string FirstName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Last Name" )]
+      [Description( "This property uses a TextBox as the default editor." )]
+      public string LastName
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Date of Birth" )]
+      [Description( "This property uses the DateTimeUpDown as the default editor." )]
+      public DateTime DateOfBirth
+      {
+        get;
+        set;
+      }
+
+      [DisplayName( "Grade Point Average" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double GradePointAvg
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [Description( "This property uses the IntegerUpDown as the default editor." )]
+      public int Age
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Is Male" )]
+      [Description( "This property uses a CheckBox as the default editor." )]
+      public bool IsMale
+      {
+        get;
+        set;
+      }
+
+      [Category( "Information" )]
+      [DisplayName( "Favorite Color" )]
+      [Description( "This property uses the ColorPicker as the default editor." )]
+      public Color FavoriteColor
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Hand" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public HorizontalAlignment WritingHand
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font" )]
+      [Description( "This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values" )]
+      public FontFamily WritingFont
+      {
+        get;
+        set;
+      }
+
+      [Category( "Writing" )]
+      [DisplayName( "Writing Font Size" )]
+      [Description( "This property uses the DoubleUpDown as the default editor." )]
+      public double WritingFontSize
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [DisplayName( "Pet Names" )]
+      [Description( "This property uses the PrimitiveTypeCollectionEditor as the default editor." )]
+      public List<String> PetNames
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property uses the CollectionEditor as the default editor." )]
+      public List<Person> Friends
+      {
+        get;
+        set;
+      }
+
+      [Category( "Conections" )]
+      [Description( "This property is a complex property and has no default editor." )]
+      public Person Spouse
+      {
+        get;
+        set;
+      }
 
-        public class Person
+      public static Person CreatePerson()
+      {
+        var person = new Person();
+        person.FirstName = "John";
+        person.LastName = "Doe";
+        person.DateOfBirth = new DateTime( 1975, 1, 23 );
+        person.Age = DateTime.Today.Year - person.DateOfBirth.Year;
+        person.GradePointAvg = 3.98;
+        person.IsMale = true;
+        person.FavoriteColor = Colors.Blue;
+        person.WritingHand = System.Windows.HorizontalAlignment.Right;
+        person.WritingFont = new FontFamily( "Arial" );
+        person.WritingFontSize = 12.5;
+        person.PetNames = new List<string>() { "Pet 1", "Pet 2", "Pet 3" };
+        person.Friends = new List<Person>() { new Person() { FirstName = "First", LastName = "Friend" }, new Person() { FirstName = "Second", LastName = "Friend" } };
+        person.Spouse = new Person()
         {
-            [Category("Information")]
-            [DisplayName("First Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            public string FirstName { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Last Name")]
-            [Description("This property uses a TextBox as the default editor.")]
-            public string LastName { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Date of Birth")]
-            [Description("This property uses the DateTimeUpDown as the default editor.")]
-            public DateTime DateOfBirth { get; set; }
-
-            [DisplayName("Grade Point Average")]
-            [Description("This property uses the DoubleUpDown as the default editor.")]
-            public double GradePointAvg { get; set; }
-
-            [Category("Information")]
-            [Description("This property uses the IntegerUpDown as the default editor.")]
-            public int Age { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Is Male")]
-            [Description("This property uses a CheckBox as the default editor.")]
-            public bool IsMale { get; set; }
-
-            [Category("Information")]
-            [DisplayName("Favorite Color")]
-            [Description("This property uses the ColorPicker as the default editor.")]
-            public Color FavoriteColor { get; set; }
-
-            [Category("Writing")]
-            [DisplayName("Writing Hand")]
-            [Description("This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values")]
-            public HorizontalAlignment WritingHand { get; set; }
-
-            [Category("Writing")]
-            [DisplayName("Writing Font")]
-            [Description("This property uses a ComboBox as the default editor.  The ComboBox is auto populated with the enum values")]
-            public FontFamily WritingFont { get; set; }
-
-            [Category("Writing")]
-            [DisplayName("Writing Font Size")]
-            [Description("This property uses the DoubleUpDown as the default editor.")]
-            public double WritingFontSize { get; set; }
-
-            [Category("Conections")]
-            [DisplayName("Pet Names")]
-            [Description("This property uses the PrimitiveTypeCollectionEditor as the default editor.")]
-            public List<String> PetNames { get; set; }
-
-            [Category("Conections")]
-            [Description("This property uses the CollectionEditor as the default editor.")]
-            public List<Person> Friends { get; set; }
-
-            [Category("Conections")]
-            [Description("This property is a complex property and has no default editor.")]
-            public Person Spouse { get; set; }
-
-            public static Person CreatePerson()
-            {
-                var person = new Person();
-                person.FirstName = "John";
-                person.LastName = "Doe";
-                person.DateOfBirth = new DateTime(1975, 1, 23);
-                person.Age = DateTime.Today.Year - person.DateOfBirth.Year;
-                person.GradePointAvg = 3.98;
-                person.IsMale = true;
-                person.FavoriteColor = Colors.Blue;
-                person.WritingHand = System.Windows.HorizontalAlignment.Right;
-                person.WritingFont = new FontFamily("Arial");
-                person.WritingFontSize = 12.5;
-                person.PetNames = new List<string>() { "Pet 1", "Pet 2", "Pet 3" };
-                person.Friends = new List<Person>() { new Person() { FirstName = "First", LastName = "Friend" }, new Person() { FirstName = "Second", LastName = "Friend" } };
-                person.Spouse = new Person() { FirstName = "Jane", LastName = "Doe" };
-                return person;
-            }
-        }
+          FirstName = "Jane",
+          LastName = "Doe"
+        };
+        return person;
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Properties/AssemblyInfo.cs
index 9ecc44c7..c4b6a4c7 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Properties/AssemblyInfo.cs
@@ -1,25 +1,41 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Samples.Modules.Text")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Samples.Modules.Text")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Samples.Modules.Text" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Microsoft" )]
+[assembly: AssemblyProduct( "Samples.Modules.Text" )]
+[assembly: AssemblyCopyright( "Copyright © Microsoft 2011" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -33,11 +49,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,5 +67,5 @@ 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs
index 3cac99eb..fced0bd2 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/TextModule.cs
@@ -1,26 +1,45 @@
-using System;
-using Microsoft.Practices.Unity;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
 using Samples.Infrastructure;
 using Samples.Infrastructure.Extensions;
 using Samples.Modules.Text.Views;
 
 namespace Samples.Modules.Text
 {
-    public class TextModule: ModuleBase
+  public class TextModule : ModuleBase
+  {
+    public TextModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
     {
-        public TextModule(IUnityContainer container, IRegionManager regionManager)
-            : base(container, regionManager) { }
-
-        protected override void InitializeModule()
-        {
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView));
-        }
-
-        protected override void RegisterViewsAndTypes()
-        {
-            Container.RegisterNavigationType(typeof(HomeView));
-            Container.RegisterNavigationType(typeof(WatermarkTextBoxView));
-        }
+      Container.RegisterNavigationType( typeof( HomeView ) );
+      Container.RegisterNavigationType( typeof( WatermarkTextBoxView ) );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml
index 947cabd9..a8f764f1 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml
@@ -1,13 +1,34 @@
-<infControls:DemoView x:Class="Samples.Modules.Text.Views.HomeView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.Text.Views.HomeView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="Text Controls">
-    <Grid>
-        <extToolkit:TokenizedTextBox x:Name="_textBox"
-                                     DisplayMemberPath="FullName"
-                                     SearchMemberPath="FirstName"
-                                     ValueMemberPath="Id" HorizontalAlignment="Center" VerticalAlignment="Center" Width="250"  />
-    </Grid>
+   <Grid>
+      <extToolkit:TokenizedTextBox x:Name="_textBox"
+                                   DisplayMemberPath="FullName"
+                                   SearchMemberPath="FirstName"
+                                   ValueMemberPath="Id" 
+                                   HorizontalAlignment="Center" 
+                                   VerticalAlignment="Center" 
+                                   Width="250" />
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml.cs
index c57e379b..d2145440 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/HomeView.xaml.cs
@@ -1,42 +1,76 @@
-using System;
-using Samples.Infrastructure.Controls;
-using Microsoft.Practices.Prism.Regions;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Collections.Generic;
+using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.Text.Views
 {
-    /// <summary>
-    /// Interaction logic for HomeView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class HomeView : DemoView
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
     {
-        public HomeView()
+      InitializeComponent();
+
+      _textBox.Text = "1;2;"; //is of object ids
+      _textBox.ItemsSource = new List<Email>()
         {
-            InitializeComponent();
-
-            _textBox.Text = "1;2;"; //is of object ids
-            _textBox.ItemsSource = new List<Email>()
-            {
-                new Email() { Id = 1, FirstName = "John", LastName = "Doe", EmailAddress = "john@test.com" },
-                new Email() { Id = 2, FirstName = "Jane", LastName = "Doe", EmailAddress = "jane@test.com" },
-            };
-        }
+            new Email() { Id = 1, FirstName = "John", LastName = "Doe", EmailAddress = "john@test.com" },
+            new Email() { Id = 2, FirstName = "Jane", LastName = "Doe", EmailAddress = "jane@test.com" },
+        };
+    }
+
+    public class Email
+    {
+      public int Id
+      {
+        get;
+        set;
+      }
+      public string FirstName
+      {
+        get;
+        set;
+      }
+      public string LastName
+      {
+        get;
+        set;
+      }
+      public string EmailAddress
+      {
+        get;
+        set;
+      }
 
-        public class Email
+      public string FullName
+      {
+        get
         {
-            public int Id { get; set; }
-            public string FirstName { get; set; }
-            public string LastName { get; set; }
-            public string EmailAddress { get; set; }
-
-            public string FullName
-            {
-                get
-                {
-                    return String.Format("{0}, {1}", LastName, FirstName);
-                }
-            }
+          return String.Format( "{0}, {1}", LastName, FirstName );
         }
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml
index 87929223..42d61b9f 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml
@@ -1,16 +1,34 @@
-<TreeViewItem x:Class="Samples.Modules.Text.Views.NavigationView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Text.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:views="clr-namespace:Samples.Modules.Text.Views"
               Header="Text" Tag="{x:Type views:HomeView}">
 
-    <TreeViewItem.Resources>
-        <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
-    
-    <TreeViewItem Header="MaskedTextBox" />
-    <TreeViewItem Header="MultiLineTextEditor" />
-    <TreeViewItem Header="RichTextBox" />
-    <TreeViewItem Header="WatermarkTextBox" Tag="{x:Type views:WatermarkTextBoxView}" />
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
+
+   <TreeViewItem Header="MaskedTextBox" />
+   <TreeViewItem Header="MultiLineTextEditor" />
+   <TreeViewItem Header="RichTextBox" />
+   <TreeViewItem Header="WatermarkTextBox" Tag="{x:Type views:WatermarkTextBoxView}" />
 
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml.cs
index d7ff8652..24ad6107 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/NavigationView.xaml.cs
@@ -1,27 +1,33 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.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 Samples.Modules.Text.Views
 {
-    /// <summary>
-    /// Interaction logic for NavigationView.xaml
-    /// </summary>
-    public partial class NavigationView : TreeViewItem
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
     {
-        public NavigationView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml
index aa502873..992707d3 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml
@@ -1,48 +1,66 @@
-<infControls:DemoView x:Class="Samples.Modules.Text.Views.WatermarkTextBoxView"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.Text.Views.WatermarkTextBoxView"
                       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                       xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
                       xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="WatermarkTextBox">
-    <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="Auto" />
-            <RowDefinition Height="*"/>
-        </Grid.RowDefinitions>
-
-        <TextBlock Text="The WatermarkTextBox is simply a TextBox that allows you to sepcify an object, usually a String, to represent null or missing text." />
-
-        <GroupBox Header="Features" Grid.Row="1" >
-            <Grid Margin="5">
-                <CheckBox x:Name="_selectAll" Content="SelectAllOnGotFocus" VerticalAlignment="Center" Margin="5" ToolTip="Selects all text in the WatermarkTextBox when it receives focus." />
-            </Grid>
-        </GroupBox>
-
-        <StackPanel Grid.Row="2" Margin="10">
-            <TextBlock Text="Default:" Style="{StaticResource Header}" />
-            <extToolkit:WatermarkTextBox Grid.Column="1" Margin="5" MinWidth="200" Watermark="Enter Text" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}"/>
-
-            <TextBlock Text="Image Watermark:" Style="{StaticResource Header}" />
-            <extToolkit:WatermarkTextBox Grid.Column="1" Margin="5" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}" >
-                <extToolkit:WatermarkTextBox.Watermark>
-                    <StackPanel Orientation="Horizontal">
-                        <Image Source="/Samples.Modules.Text;component/Images/PencilTool16.png" Stretch="None" />
-                        <TextBlock Text="Enter Text" Margin="4,0,0,0" />
-                    </StackPanel>
-                </extToolkit:WatermarkTextBox.Watermark>
-            </extToolkit:WatermarkTextBox>
-
-            <TextBlock Grid.Row="2" Text="Custom WatermarkTemplate:" Style="{StaticResource Header}" />
-            <extToolkit:WatermarkTextBox Grid.Row="2" Grid.Column="1" Margin="5" Watermark="Enter Text" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}">
-                <extToolkit:WatermarkTextBox.WatermarkTemplate>
-                    <DataTemplate>
-                        <Border BorderBrush="Green" BorderThickness="1" Padding="5" >
-                            <ContentControl Content="{Binding}" Foreground="DarkRed" FontWeight="Bold" Focusable="False" />
-                        </Border>
-                    </DataTemplate>
-                </extToolkit:WatermarkTextBox.WatermarkTemplate>
-            </extToolkit:WatermarkTextBox>
-        </StackPanel>
-    </Grid>
+   <Grid>
+      <Grid.RowDefinitions>
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="Auto" />
+         <RowDefinition Height="*" />
+      </Grid.RowDefinitions>
+
+      <TextBlock Text="The WatermarkTextBox is simply a TextBox that allows you to sepcify an object, usually a String, to represent null or missing text." />
+
+      <GroupBox Header="Features" Grid.Row="1">
+         <Grid Margin="5">
+            <CheckBox x:Name="_selectAll" Content="SelectAllOnGotFocus" VerticalAlignment="Center" Margin="5" ToolTip="Selects all text in the WatermarkTextBox when it receives focus." />
+         </Grid>
+      </GroupBox>
+
+      <StackPanel Grid.Row="2" Margin="10">
+         <TextBlock Text="Default:" Style="{StaticResource Header}" />
+         <extToolkit:WatermarkTextBox Grid.Column="1" Margin="5" MinWidth="200" Watermark="Enter Text" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}" />
+
+         <TextBlock Text="Image Watermark:" Style="{StaticResource Header}" />
+         <extToolkit:WatermarkTextBox Grid.Column="1" Margin="5" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}">
+            <extToolkit:WatermarkTextBox.Watermark>
+               <StackPanel Orientation="Horizontal">
+                  <Image Source="/Samples.Modules.Text;component/Images/PencilTool16.png" Stretch="None" />
+                  <TextBlock Text="Enter Text" Margin="4,0,0,0" />
+               </StackPanel>
+            </extToolkit:WatermarkTextBox.Watermark>
+         </extToolkit:WatermarkTextBox>
+
+         <TextBlock Grid.Row="2" Text="Custom WatermarkTemplate:" Style="{StaticResource Header}" />
+         <extToolkit:WatermarkTextBox Grid.Row="2" Grid.Column="1" Margin="5" Watermark="Enter Text" SelectAllOnGotFocus="{Binding IsChecked, ElementName=_selectAll}">
+            <extToolkit:WatermarkTextBox.WatermarkTemplate>
+               <DataTemplate>
+                  <Border BorderBrush="Green" BorderThickness="1" Padding="5">
+                     <ContentControl Content="{Binding}" Foreground="DarkRed" FontWeight="Bold" Focusable="False" />
+                  </Border>
+               </DataTemplate>
+            </extToolkit:WatermarkTextBox.WatermarkTemplate>
+         </extToolkit:WatermarkTextBox>
+      </StackPanel>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs
index 899e78b5..b45a2d3f 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Text/Views/WatermarkTextBoxView.xaml.cs
@@ -1,18 +1,35 @@
-using System;
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.Text.Views
 {
-    /// <summary>
-    /// Interaction logic for WatermarkTextBoxView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive=false)]
-    public partial class WatermarkTextBoxView : DemoView
+  /// <summary>
+  /// Interaction logic for WatermarkTextBoxView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class WatermarkTextBoxView : DemoView
+  {
+    public WatermarkTextBoxView()
     {
-        public WatermarkTextBoxView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Properties/AssemblyInfo.cs
index 99b84eaa..111a15a4 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Properties/AssemblyInfo.cs
@@ -1,25 +1,41 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Samples.Modules.Wizard")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Samples.Modules.Wizard")]
-[assembly: AssemblyCopyright("Copyright ©  2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Samples.Modules.Wizard" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "" )]
+[assembly: AssemblyProduct( "Samples.Modules.Wizard" )]
+[assembly: AssemblyCopyright( "Copyright ©  2011" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -33,11 +49,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,5 +67,5 @@ 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml
index 7b8902a0..ade5fb37 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml
@@ -1,24 +1,42 @@
-<infControls:DemoView x:Class="Samples.Modules.Wizard.Views.HomeView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
-             xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<infControls:DemoView x:Class="Samples.Modules.Wizard.Views.HomeView"
+                      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                      xmlns:infControls="clr-namespace:Samples.Infrastructure.Controls;assembly=Samples.Infrastructure"
+                      xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended"
                       Title="Wizard">
-    <Grid>
-        <extToolkit:Wizard FinishButtonClosesWindow="True">
-            <extToolkit:WizardPage x:Name="IntroPage" 
+   <Grid>
+      <extToolkit:Wizard FinishButtonClosesWindow="True">
+         <extToolkit:WizardPage x:Name="IntroPage" 
                                    Title="Welcome to my Wizard"
                                    Description="This Wizard will walk you though how to do something." />
-            <extToolkit:WizardPage x:Name="Page1" PageType="Interior"
+         <extToolkit:WizardPage x:Name="Page1" PageType="Interior"
                                    Title="Page 1"
-                                   Description="This is the first page in the process."/>
-            <extToolkit:WizardPage x:Name="Page2" PageType="Interior"
+                                   Description="This is the first page in the process." />
+         <extToolkit:WizardPage x:Name="Page2" PageType="Interior"
                                    Title="Page 2"
-                                   Description="This is the second page in the process"/>
-            <extToolkit:WizardPage x:Name="LastPage" PageType="Interior"
+                                   Description="This is the second page in the process" />
+         <extToolkit:WizardPage x:Name="LastPage" PageType="Interior"
                                    Title="Last Page"
                                    Description="This is the last page in the process"
-                                   CanFinish="True"/>
-        </extToolkit:Wizard>
-    </Grid>
+                                   CanFinish="True" />
+      </extToolkit:Wizard>
+   </Grid>
 </infControls:DemoView>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml.cs
index 27e26956..abb65601 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/HomeView.xaml.cs
@@ -1,18 +1,35 @@
-using System;
-using Samples.Infrastructure.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
+using Samples.Infrastructure.Controls;
 
 namespace Samples.Modules.Wizard.Views
 {
-    /// <summary>
-    /// Interaction logic for HomeView.xaml
-    /// </summary>
-    [RegionMemberLifetime(KeepAlive = false)]
-    public partial class HomeView : DemoView
+  /// <summary>
+  /// Interaction logic for HomeView.xaml
+  /// </summary>
+  [RegionMemberLifetime( KeepAlive = false )]
+  public partial class HomeView : DemoView
+  {
+    public HomeView()
     {
-        public HomeView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml
index 20fef08a..e87664c4 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml
@@ -1,11 +1,29 @@
-<TreeViewItem x:Class="Samples.Modules.Wizard.Views.NavigationView"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<TreeViewItem x:Class="Samples.Modules.Wizard.Views.NavigationView"
+              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
               xmlns:views="clr-namespace:Samples.Modules.Wizard.Views"
               Header="Wizard" Tag="{x:Type views:HomeView}" >
 
-    <TreeViewItem.Resources>
-        <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
-    </TreeViewItem.Resources>
+   <TreeViewItem.Resources>
+      <Style TargetType="views:NavigationView" BasedOn="{StaticResource {x:Type TreeViewItem}}" />
+   </TreeViewItem.Resources>
 
 </TreeViewItem>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml.cs
index 37a2b692..a3c1df1d 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/Views/NavigationView.xaml.cs
@@ -1,27 +1,33 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.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 Samples.Modules.Wizard.Views
 {
-    /// <summary>
-    /// Interaction logic for NavigationView.xaml
-    /// </summary>
-    public partial class NavigationView : TreeViewItem
+  /// <summary>
+  /// Interaction logic for NavigationView.xaml
+  /// </summary>
+  public partial class NavigationView : TreeViewItem
+  {
+    public NavigationView()
     {
-        public NavigationView()
-        {
-            InitializeComponent();
-        }
+      InitializeComponent();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/WizardModule.cs b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/WizardModule.cs
index 1c569d73..3397078a 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/WizardModule.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Modules/Samples.Modules.Wizard/WizardModule.cs
@@ -1,25 +1,44 @@
-using System;
-using Samples.Infrastructure;
-using Samples.Infrastructure.Extensions;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Regions;
 using Microsoft.Practices.Unity;
+using Samples.Infrastructure;
+using Samples.Infrastructure.Extensions;
 using Samples.Modules.Wizard.Views;
 
 namespace Samples.Modules.Wizard
 {
-    public class WizardModule : ModuleBase
+  public class WizardModule : ModuleBase
+  {
+    public WizardModule( IUnityContainer container, IRegionManager regionManager )
+      : base( container, regionManager )
+    {
+    }
+
+    protected override void InitializeModule()
+    {
+      RegionManager.RegisterViewWithRegion( RegionNames.NavigationRegion, typeof( NavigationView ) );
+    }
+
+    protected override void RegisterViewsAndTypes()
     {
-        public WizardModule(IUnityContainer container, IRegionManager regionManager)
-            : base(container, regionManager) { }
-
-        protected override void InitializeModule()
-        {
-            RegionManager.RegisterViewWithRegion(RegionNames.NavigationRegion, typeof(NavigationView));
-        }
-
-        protected override void RegisterViewsAndTypes()
-        {
-            Container.RegisterNavigationType(typeof(HomeView));
-        }
+      Container.RegisterNavigationType( typeof( HomeView ) );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs
index a9cd0438..c1ef117c 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewCommandBehavior.cs
@@ -1,26 +1,44 @@
-using System;
-using Microsoft.Practices.Prism.Commands;
-using System.Windows.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
+using System.Windows.Controls;
+using Microsoft.Practices.Prism.Commands;
 
 namespace Samples.Infrastructure.Commands
 {
-    public class TreeViewCommandBehavior : CommandBehaviorBase<TreeView>
+  public class TreeViewCommandBehavior : CommandBehaviorBase<TreeView>
+  {
+    public TreeViewCommandBehavior( TreeView treeView )
+      : base( treeView )
+    {
+      treeView.SelectedItemChanged += SelectedItemChanged;
+    }
+
+    void SelectedItemChanged( object sender, RoutedPropertyChangedEventArgs<object> e )
     {
-        public TreeViewCommandBehavior(TreeView treeView)
-            : base(treeView)
-        {
-            treeView.SelectedItemChanged += SelectedItemChanged;
-        }
-
-        void SelectedItemChanged(object sender, RoutedPropertyChangedEventArgs<object> e)
-        {
-            //This treeview command is specfic to the navigation region, 
-            //so I always want to pass the tag of the selected treeviewitem
-            //because it will conatin the Type of view to navigate to.
-            var type = (e.NewValue as FrameworkElement).Tag as Type;
-            CommandParameter = type != null ? type.FullName : null;
-            ExecuteCommand();
-        }
+      //This treeview command is specfic to the navigation region, 
+      //so I always want to pass the tag of the selected treeviewitem
+      //because it will conatin the Type of view to navigate to.
+      var type = ( e.NewValue as FrameworkElement ).Tag as Type;
+      CommandParameter = type != null ? type.FullName : null;
+      ExecuteCommand();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewSelected.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewSelected.cs
index 4a5fb541..7234ea64 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewSelected.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Commands/TreeViewSelected.cs
@@ -1,64 +1,81 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
 namespace Samples.Infrastructure.Commands
 {
-    public class TreeViewSelected
-    {
-        private static readonly DependencyProperty SelectedCommandBehaviorProperty = DependencyProperty.RegisterAttached("SelectedCommandBehavior", typeof(TreeViewCommandBehavior), typeof(TreeViewSelected), null);
+  public class TreeViewSelected
+  {
+    private static readonly DependencyProperty SelectedCommandBehaviorProperty = DependencyProperty.RegisterAttached( "SelectedCommandBehavior", typeof( TreeViewCommandBehavior ), typeof( TreeViewSelected ), null );
 
-        public static readonly DependencyProperty CommandProperty = DependencyProperty.RegisterAttached("Command", typeof(ICommand), typeof(TreeViewSelected), new PropertyMetadata(OnSetCommandCallback));
-        public static void SetCommand(TreeView menuItem, ICommand command)
-        {
-            menuItem.SetValue(CommandProperty, command);
-        }
-        public static ICommand GetCommand(TreeView menuItem)
-        {
-            return menuItem.GetValue(CommandProperty) as ICommand;
-        }
+    public static readonly DependencyProperty CommandProperty = DependencyProperty.RegisterAttached( "Command", typeof( ICommand ), typeof( TreeViewSelected ), new PropertyMetadata( OnSetCommandCallback ) );
+    public static void SetCommand( TreeView menuItem, ICommand command )
+    {
+      menuItem.SetValue( CommandProperty, command );
+    }
+    public static ICommand GetCommand( TreeView menuItem )
+    {
+      return menuItem.GetValue( CommandProperty ) as ICommand;
+    }
 
-        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.RegisterAttached("CommandParameter", typeof(object), typeof(TreeViewSelected), new PropertyMetadata(OnSetCommandParameterCallback));
-        public static void SetCommandParameter(TreeView menuItem, object parameter)
-        {
-            menuItem.SetValue(CommandParameterProperty, parameter);
-        }
-        public static object GetCommandParameter(TreeView menuItem)
-        {
-            return menuItem.GetValue(CommandParameterProperty);
-        }
+    public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.RegisterAttached( "CommandParameter", typeof( object ), typeof( TreeViewSelected ), new PropertyMetadata( OnSetCommandParameterCallback ) );
+    public static void SetCommandParameter( TreeView menuItem, object parameter )
+    {
+      menuItem.SetValue( CommandParameterProperty, parameter );
+    }
+    public static object GetCommandParameter( TreeView menuItem )
+    {
+      return menuItem.GetValue( CommandParameterProperty );
+    }
 
-        private static void OnSetCommandCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
-        {
-            TreeView menuItem = dependencyObject as TreeView;
-            if (menuItem != null)
-            {
-                TreeViewCommandBehavior behavior = GetOrCreateBehavior(menuItem);
-                behavior.Command = e.NewValue as ICommand;
-            }
-        }
+    private static void OnSetCommandCallback( DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e )
+    {
+      TreeView menuItem = dependencyObject as TreeView;
+      if( menuItem != null )
+      {
+        TreeViewCommandBehavior behavior = GetOrCreateBehavior( menuItem );
+        behavior.Command = e.NewValue as ICommand;
+      }
+    }
 
-        private static void OnSetCommandParameterCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e)
-        {
-            TreeView menuItem = dependencyObject as TreeView;
-            if (menuItem != null)
-            {
-                TreeViewCommandBehavior behavior = GetOrCreateBehavior(menuItem);
-                behavior.CommandParameter = e.NewValue;
-            }
-        }
+    private static void OnSetCommandParameterCallback( DependencyObject dependencyObject, DependencyPropertyChangedEventArgs e )
+    {
+      TreeView menuItem = dependencyObject as TreeView;
+      if( menuItem != null )
+      {
+        TreeViewCommandBehavior behavior = GetOrCreateBehavior( menuItem );
+        behavior.CommandParameter = e.NewValue;
+      }
+    }
 
-        private static TreeViewCommandBehavior GetOrCreateBehavior(TreeView menuItem)
-        {
-            TreeViewCommandBehavior behavior = menuItem.GetValue(SelectedCommandBehaviorProperty) as TreeViewCommandBehavior;
-            if (behavior == null)
-            {
-                behavior = new TreeViewCommandBehavior(menuItem);
-                menuItem.SetValue(SelectedCommandBehaviorProperty, behavior);
-            }
+    private static TreeViewCommandBehavior GetOrCreateBehavior( TreeView menuItem )
+    {
+      TreeViewCommandBehavior behavior = menuItem.GetValue( SelectedCommandBehaviorProperty ) as TreeViewCommandBehavior;
+      if( behavior == null )
+      {
+        behavior = new TreeViewCommandBehavior( menuItem );
+        menuItem.SetValue( SelectedCommandBehaviorProperty, behavior );
+      }
 
-            return behavior;
-        }
+      return behavior;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Controls/DemoView.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Controls/DemoView.cs
index 35781dd1..3c3327b1 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Controls/DemoView.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Controls/DemoView.cs
@@ -1,118 +1,154 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
+using System.IO;
 using System.Windows;
 using System.Windows.Controls;
-using System.IO;
 
 namespace Samples.Infrastructure.Controls
 {
-    public class DemoView : ContentControl
+  public class DemoView : ContentControl
+  {
+    #region Members
+
+    readonly string _applicationPath = String.Empty;
+    const string _samplesFolderName = "Samples";
+
+    #endregion //Members
+
+    #region Properties
+
+    public static readonly DependencyProperty CSharpTextProperty = DependencyProperty.Register( "CSharpText", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( null ) );
+    public string CSharpText
+    {
+      get
+      {
+        return ( string )GetValue( CSharpTextProperty );
+      }
+      set
+      {
+        SetValue( CSharpTextProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty TitleProperty = DependencyProperty.Register( "Title", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( null ) );
+    public string Title
+    {
+      get
+      {
+        return ( string )GetValue( TitleProperty );
+      }
+      set
+      {
+        SetValue( TitleProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty XamlTextProperty = DependencyProperty.Register( "XamlText", typeof( string ), typeof( DemoView ), new UIPropertyMetadata( null ) );
+    public string XamlText
+    {
+      get
+      {
+        return ( string )GetValue( XamlTextProperty );
+      }
+      set
+      {
+        SetValue( XamlTextProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static DemoView()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DemoView ), new FrameworkPropertyMetadata( typeof( DemoView ) ) );
+    }
+
+    public DemoView()
     {
-        #region Members
-
-        readonly string _applicationPath = String.Empty;
-        const string _samplesFolderName = "Samples";
-
-        #endregion //Members
-
-        #region Properties
-
-        public static readonly DependencyProperty CSharpTextProperty = DependencyProperty.Register("CSharpText", typeof(string), typeof(DemoView), new UIPropertyMetadata(null));
-        public string CSharpText
-        {
-            get { return (string)GetValue(CSharpTextProperty); }
-            set { SetValue(CSharpTextProperty, value); }
-        }
-
-        public static readonly DependencyProperty TitleProperty = DependencyProperty.Register("Title", typeof(string), typeof(DemoView), new UIPropertyMetadata(null));
-        public string Title
-        {
-            get { return (string)GetValue(TitleProperty); }
-            set { SetValue(TitleProperty, value); }
-        }
-        
-        public static readonly DependencyProperty XamlTextProperty = DependencyProperty.Register("XamlText", typeof(string), typeof(DemoView), new UIPropertyMetadata(null));
-        public string XamlText
-        {
-            get { return (string)GetValue(XamlTextProperty); }
-            set { SetValue(XamlTextProperty, value); }
-        }
-
-        #endregion //Properties
-
-        #region Constructors
-
-        static DemoView()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(DemoView), new FrameworkPropertyMetadata(typeof(DemoView)));
-        }
-
-        public DemoView()
-        {
-            _applicationPath = Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location);
-        }
-
-        #endregion //Constructors
-
-        #region Base Class Overrides
-
-        protected override void OnContentChanged(object oldContent, object newContent)
-        {
-            base.OnContentChanged(oldContent, newContent);
-            //the parent of the content will be the View
-            ResolveContentCode((newContent as FrameworkElement).Parent);
-        }
-
-        #endregion //Base Class Overrides
-
-        #region Methods
-
-        private void ResolveContentCode(object newContent)
-        {
-            //get the type of the content loaded in the ContentRegion
-            var type = newContent.GetType();
-            //grab only the name of the content which will correspond to the name of the file to load
-            var viewName = type.FullName.Substring(type.FullName.LastIndexOf(".") + 1);
-            //get the module name
-            var moduleName = type.Module.Name.Replace(".dll", String.Empty);
-
-            SetText(viewName, moduleName);
-        }
-
-        private void SetText(string viewName, string moduleName)
-        {
-            SetCSharpText(viewName, moduleName);
-            SetXamlText(viewName, moduleName);
-        }
-
-        private void SetCSharpText(string viewName, string moduleName)
-        {
-            //now we need to append the file extension
-            string fileName = String.Format("{0}.xaml", viewName);
-            string filePath = GetFilePath(moduleName, fileName);
-            XamlText = ReadFileText(filePath);
-        }
-
-        private void SetXamlText(string viewName, string moduleName)
-        {
-            //now we need to append the file extension
-            string fileName = String.Format("{0}.xaml.cs", viewName);
-            string filePath = GetFilePath(moduleName, fileName);
-            CSharpText = ReadFileText(filePath);
-        }
-
-        private string GetFilePath(string moduleName, string fileName)
-        {
-            return Path.Combine(_applicationPath, _samplesFolderName, moduleName, fileName);
-        }
-
-        private static string ReadFileText(string filePath)
-        {
-            string text = String.Empty;
-            if (File.Exists(filePath))
-                text = File.ReadAllText(filePath);
-            return text;
-        }
-
-        #endregion //Methods
+      _applicationPath = Path.GetDirectoryName( System.Reflection.Assembly.GetExecutingAssembly().Location );
     }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override void OnContentChanged( object oldContent, object newContent )
+    {
+      base.OnContentChanged( oldContent, newContent );
+      //the parent of the content will be the View
+      ResolveContentCode( ( newContent as FrameworkElement ).Parent );
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Methods
+
+    private void ResolveContentCode( object newContent )
+    {
+      //get the type of the content loaded in the ContentRegion
+      var type = newContent.GetType();
+      //grab only the name of the content which will correspond to the name of the file to load
+      var viewName = type.FullName.Substring( type.FullName.LastIndexOf( "." ) + 1 );
+      //get the module name
+      var moduleName = type.Module.Name.Replace( ".dll", String.Empty );
+
+      SetText( viewName, moduleName );
+    }
+
+    private void SetText( string viewName, string moduleName )
+    {
+      SetCSharpText( viewName, moduleName );
+      SetXamlText( viewName, moduleName );
+    }
+
+    private void SetCSharpText( string viewName, string moduleName )
+    {
+      //now we need to append the file extension
+      string fileName = String.Format( "{0}.xaml", viewName );
+      string filePath = GetFilePath( moduleName, fileName );
+      XamlText = ReadFileText( filePath );
+    }
+
+    private void SetXamlText( string viewName, string moduleName )
+    {
+      //now we need to append the file extension
+      string fileName = String.Format( "{0}.xaml.cs", viewName );
+      string filePath = GetFilePath( moduleName, fileName );
+      CSharpText = ReadFileText( filePath );
+    }
+
+    private string GetFilePath( string moduleName, string fileName )
+    {
+      return Path.Combine( _applicationPath, _samplesFolderName, moduleName, fileName );
+    }
+
+    private static string ReadFileText( string filePath )
+    {
+      string text = String.Empty;
+      if( File.Exists( filePath ) )
+        text = File.ReadAllText( filePath );
+      return text;
+    }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/CSharpColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/CSharpColorConverter.cs
index 4cf405d6..28570d2f 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/CSharpColorConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/CSharpColorConverter.cs
@@ -1,43 +1,58 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows.Data;
-using Samples.Infrastructure.Core.CodeFormatting;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Documents;
 using System.Windows.Media;
+using Samples.Infrastructure.Core.CodeFormatting;
 
 namespace Samples.Infrastructure.Converters
 {
-    public class CSharpColorConverter : IValueConverter
+  public class CSharpColorConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value == null )
+        return value;
+
+      String val = ( String )value;
+
+      CSharpFormat cSharpFormat = new CSharpFormat();
+      FlowDocument doc = new FlowDocument();
+      Paragraph p = new Paragraph();
+      p = cSharpFormat.FormatCode( val );
+      doc.Blocks.Add( p );
+
+      RichTextBox rtb = new RichTextBox();
+      rtb.IsReadOnly = true;
+      rtb.Document = doc;
+      rtb.Document.PageWidth = 2500.0;
+      rtb.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
+      rtb.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
+      rtb.FontFamily = new FontFamily( "Courier New" );
+      return rtb;
+    }
+
+    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)
-        {
-            if (value == null)
-                return value;
-
-            String val = (String)value;
-
-            CSharpFormat cSharpFormat = new CSharpFormat();
-            FlowDocument doc = new FlowDocument();
-            Paragraph p = new Paragraph();
-            p = cSharpFormat.FormatCode(val);
-            doc.Blocks.Add(p);
-
-            RichTextBox rtb = new RichTextBox();
-            rtb.IsReadOnly = true;
-            rtb.Document = doc;
-            rtb.Document.PageWidth = 2500.0;
-            rtb.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
-            rtb.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
-            rtb.FontFamily = new FontFamily("Courier New");
-            return rtb;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+      throw new NotImplementedException();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/XamlColorConverter.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/XamlColorConverter.cs
index becbc473..827f6d13 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/XamlColorConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Converters/XamlColorConverter.cs
@@ -1,121 +1,139 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Collections.Generic;
+using System.Windows.Controls;
 using System.Windows.Data;
-using System.Windows.Media;
 using System.Windows.Documents;
-using System.Windows.Controls;
+using System.Windows.Media;
 using Samples.Infrastructure.Core.CodeFormatting;
 
 namespace Samples.Infrastructure.Converters
 {
-    public class XamlColorConverter : IValueConverter
+  public class XamlColorConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value == null )
+        return value;
+
+      string xaml = value as string;
+
+      FlowDocument doc = new FlowDocument();
+      ColorizeXAML( xaml, doc );
+
+      RichTextBox rtb = new RichTextBox();
+      rtb.IsReadOnly = true;
+      rtb.Document = doc;
+      rtb.Document.PageWidth = 2500.0;
+      rtb.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
+      rtb.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
+      rtb.FontFamily = new FontFamily( "Courier New" );
+      return rtb;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #region SyntaxColoring
+
+    #region ColorizeXAML
+
+    public void ColorizeXAML( string xamlText, FlowDocument targetDoc )
+    {
+      XmlTokenizer tokenizer = new XmlTokenizer();
+      XmlTokenizerMode mode = XmlTokenizerMode.OutsideElement;
+
+      List<XmlToken> tokens = tokenizer.Tokenize( xamlText, ref mode );
+      List<string> tokenTexts = new List<string>( tokens.Count );
+      List<Color> colors = new List<Color>( tokens.Count );
+      int position = 0;
+      foreach( XmlToken token in tokens )
+      {
+        string tokenText = xamlText.Substring( position, token.Length );
+        tokenTexts.Add( tokenText );
+        Color color = ColorForToken( token, tokenText );
+        colors.Add( color );
+        position += token.Length;
+      }
+
+      Paragraph p = new Paragraph();
+
+      // Loop through tokens
+      for( int i = 0; i < tokenTexts.Count; i++ )
+      {
+        Run r = new Run( tokenTexts[ i ] );
+        r.Foreground = new SolidColorBrush( colors[ i ] );
+        p.Inlines.Add( r );
+      }
+
+      targetDoc.Blocks.Add( p );
+    }
+
+    #endregion //ColorizeXAML
+
+    static Color ColorForToken( XmlToken token, string tokenText )
     {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (value == null)
-                return value;
-
-            string xaml = value as string;
-
-            FlowDocument doc = new FlowDocument();
-            ColorizeXAML(xaml, doc);
-
-            RichTextBox rtb = new RichTextBox();
-            rtb.IsReadOnly = true;
-            rtb.Document = doc;
-            rtb.Document.PageWidth = 2500.0;
-            rtb.HorizontalScrollBarVisibility = ScrollBarVisibility.Auto;
-            rtb.VerticalScrollBarVisibility = ScrollBarVisibility.Auto;
-            rtb.FontFamily = new FontFamily("Courier New");
-            return rtb;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-
-        #region SyntaxColoring
-
-        #region ColorizeXAML
-
-        public void ColorizeXAML(string xamlText, FlowDocument targetDoc)
-        {
-            XmlTokenizer tokenizer = new XmlTokenizer();
-            XmlTokenizerMode mode = XmlTokenizerMode.OutsideElement;
-
-            List<XmlToken> tokens = tokenizer.Tokenize(xamlText, ref mode);
-            List<string> tokenTexts = new List<string>(tokens.Count);
-            List<Color> colors = new List<Color>(tokens.Count);
-            int position = 0;
-            foreach (XmlToken token in tokens)
-            {
-                string tokenText = xamlText.Substring(position, token.Length);
-                tokenTexts.Add(tokenText);
-                Color color = ColorForToken(token, tokenText);
-                colors.Add(color);
-                position += token.Length;
-            }
-
-            Paragraph p = new Paragraph();
-
-            // Loop through tokens
-            for (int i = 0; i < tokenTexts.Count; i++)
-            {
-                Run r = new Run(tokenTexts[i]);
-                r.Foreground = new SolidColorBrush(colors[i]);
-                p.Inlines.Add(r);
-            }
-
-            targetDoc.Blocks.Add(p);
-        }
-
-        #endregion //ColorizeXAML
-
-        static Color ColorForToken(XmlToken token, string tokenText)
-        {
-            Color color = Color.FromRgb(0, 0, 0);
-            switch (token.Kind)
-            {
-                case XmlTokenKind.Open:
-                case XmlTokenKind.OpenClose:
-                case XmlTokenKind.Close:
-                case XmlTokenKind.SelfClose:
-                case XmlTokenKind.CommentBegin:
-                case XmlTokenKind.CommentEnd:
-                case XmlTokenKind.CDataBegin:
-                case XmlTokenKind.CDataEnd:
-                case XmlTokenKind.Equals:
-                case XmlTokenKind.OpenProcessingInstruction:
-                case XmlTokenKind.CloseProcessingInstruction:
-                case XmlTokenKind.AttributeValue:
-                    color = Color.FromRgb(0, 0, 255);
-                    // color = "blue";
-                    break;
-                case XmlTokenKind.ElementName:
-                    color = Color.FromRgb(163, 21, 21);
-                    // color = "brown";
-                    break;
-                case XmlTokenKind.TextContent:
-                    // color = "black";
-                    break;
-                case XmlTokenKind.AttributeName:
-                case XmlTokenKind.Entity:
-                    color = Color.FromRgb(255, 0, 0);
-                    // color = "red";
-                    break;
-                case XmlTokenKind.CommentText:
-                    color = Color.FromRgb(0, 128, 0);
-                    // color = "green";
-                    break;
-            }
-            if (token.Kind == XmlTokenKind.ElementWhitespace
-                || (token.Kind == XmlTokenKind.TextContent && tokenText.Trim() == ""))
-            {
-                // color = null;
-            }
-            return color;
-        }
-        #endregion SyntaxColoring
+      Color color = Color.FromRgb( 0, 0, 0 );
+      switch( token.Kind )
+      {
+        case XmlTokenKind.Open:
+        case XmlTokenKind.OpenClose:
+        case XmlTokenKind.Close:
+        case XmlTokenKind.SelfClose:
+        case XmlTokenKind.CommentBegin:
+        case XmlTokenKind.CommentEnd:
+        case XmlTokenKind.CDataBegin:
+        case XmlTokenKind.CDataEnd:
+        case XmlTokenKind.Equals:
+        case XmlTokenKind.OpenProcessingInstruction:
+        case XmlTokenKind.CloseProcessingInstruction:
+        case XmlTokenKind.AttributeValue:
+          color = Color.FromRgb( 0, 0, 255 );
+          // color = "blue";
+          break;
+        case XmlTokenKind.ElementName:
+          color = Color.FromRgb( 163, 21, 21 );
+          // color = "brown";
+          break;
+        case XmlTokenKind.TextContent:
+          // color = "black";
+          break;
+        case XmlTokenKind.AttributeName:
+        case XmlTokenKind.Entity:
+          color = Color.FromRgb( 255, 0, 0 );
+          // color = "red";
+          break;
+        case XmlTokenKind.CommentText:
+          color = Color.FromRgb( 0, 128, 0 );
+          // color = "green";
+          break;
+      }
+      if( token.Kind == XmlTokenKind.ElementWhitespace
+          || ( token.Kind == XmlTokenKind.TextContent && tokenText.Trim() == "" ) )
+      {
+        // color = null;
+      }
+      return color;
     }
+    #endregion SyntaxColoring
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/CSharpFormat.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/CSharpFormat.cs
index 17d7af64..1fa3a6b7 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/CSharpFormat.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/CSharpFormat.cs
@@ -22,370 +22,418 @@
 
 using System;
 using System.Collections.Generic;
-using System.Text;
 using System.IO;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows.Documents;
 using System.Windows.Media;
 
 namespace Samples.Infrastructure.Core.CodeFormatting
 {
-    public class CSharpFormat : CLikeFormat
+  public class CSharpFormat : CLikeFormat
+  {
+    /// <summary>
+    /// The list of C# keywords.
+    /// </summary>
+    protected override string Keywords
     {
-        /// <summary>
-        /// The list of C# keywords.
-        /// </summary>
-        protected override string Keywords
-        {
-            get
-            {
-                return "abstract as base bool break byte case catch char "
-                + "checked class const continue decimal default delegate do double else "
-                + "enum event explicit extern false finally fixed float for foreach goto "
-                + "if implicit in int interface internal is lock long namespace new null "
-                + "object operator out override partial params private protected public readonly "
-                + "ref return sbyte sealed short sizeof stackalloc static string struct "
-                + "switch this throw true try typeof uint ulong unchecked unsafe ushort "
-                + "using value virtual void volatile where while yield";
-            }
-        }
-
-        /// <summary>
-        /// The list of C# preprocessors.
-        /// </summary>
-        protected override string Preprocessors
-        {
-            get
-            {
-                return "#if #else #elif #endif #define #undef #warning "
-                    + "#error #line #region #endregion #pragma";
-            }
-        }
+      get
+      {
+        return "abstract as base bool break byte case catch char "
+        + "checked class const continue decimal default delegate do double else "
+        + "enum event explicit extern false finally fixed float for foreach goto "
+        + "if implicit in int interface internal is lock long namespace new null "
+        + "object operator out override partial params private protected public readonly "
+        + "ref return sbyte sealed short sizeof stackalloc static string struct "
+        + "switch this throw true try typeof uint ulong unchecked unsafe ushort "
+        + "using value virtual void volatile where while yield";
+      }
     }
 
     /// <summary>
-    /// Provides a base class for formatting languages similar to C.
+    /// The list of C# preprocessors.
     /// </summary>
-    public abstract class CLikeFormat : CodeFormat
+    protected override string Preprocessors
     {
-        /// <summary>
-        /// Regular expression string to match single line and multi-line 
-        /// comments (// and /* */). 
-        /// </summary>
-        protected override string CommentRegEx
-        {
-            get { return @"/\*.*?\*/|//.*?(?=\r|\n)"; }
-        }
-
-        /// <summary>
-        /// Regular expression string to match string and character literals. 
-        /// </summary>
-        protected override string StringRegEx
-        {
-            get { return @"@?""""|@?"".*?(?!\\).""|''|'.*?(?!\\).'"; }
-        }
+      get
+      {
+        return "#if #else #elif #endif #define #undef #warning "
+            + "#error #line #region #endregion #pragma";
+      }
     }
+  }
 
+  /// <summary>
+  /// Provides a base class for formatting languages similar to C.
+  /// </summary>
+  public abstract class CLikeFormat : CodeFormat
+  {
     /// <summary>
-    /// Provides a base class for formatting most programming languages.
+    /// Regular expression string to match single line and multi-line 
+    /// comments (// and /* */). 
     /// </summary>
-    public abstract class CodeFormat : SourceFormat
+    protected override string CommentRegEx
     {
-        /// <summary>
-        /// Must be overridden to provide a list of keywords defined in 
-        /// each language.
-        /// </summary>
-        /// <remarks>
-        /// Keywords must be separated with spaces.
-        /// </remarks>
-        protected abstract string Keywords
-        {
-            get;
-        }
-
-        /// <summary>
-        /// Can be overridden to provide a list of preprocessors defined in 
-        /// each language.
-        /// </summary>
-        /// <remarks>
-        /// Preprocessors must be separated with spaces.
-        /// </remarks>
-        protected virtual string Preprocessors
-        {
-            get { return ""; }
-        }
+      get
+      {
+        return @"/\*.*?\*/|//.*?(?=\r|\n)";
+      }
+    }
 
-        /// <summary>
-        /// Must be overridden to provide a regular expression string
-        /// to match strings literals. 
-        /// </summary>
-        protected abstract string StringRegEx
-        {
-            get;
-        }
+    /// <summary>
+    /// Regular expression string to match string and character literals. 
+    /// </summary>
+    protected override string StringRegEx
+    {
+      get
+      {
+        return @"@?""""|@?"".*?(?!\\).""|''|'.*?(?!\\).'";
+      }
+    }
+  }
 
-        /// <summary>
-        /// Must be overridden to provide a regular expression string
-        /// to match comments. 
-        /// </summary>
-        protected abstract string CommentRegEx
-        {
-            get;
-        }
+  /// <summary>
+  /// Provides a base class for formatting most programming languages.
+  /// </summary>
+  public abstract class CodeFormat : SourceFormat
+  {
+    /// <summary>
+    /// Must be overridden to provide a list of keywords defined in 
+    /// each language.
+    /// </summary>
+    /// <remarks>
+    /// Keywords must be separated with spaces.
+    /// </remarks>
+    protected abstract string Keywords
+    {
+      get;
+    }
 
-        /// <summary>
-        /// Determines if the language is case sensitive.
-        /// </summary>
-        /// <value><b>true</b> if the language is case sensitive, <b>false</b> 
-        /// otherwise. The default is true.</value>
-        /// <remarks>
-        /// A case-insensitive language formatter must override this 
-        /// property to return false.
-        /// </remarks>
-        public virtual bool CaseSensitive
-        {
-            get { return true; }
-        }
+    /// <summary>
+    /// Can be overridden to provide a list of preprocessors defined in 
+    /// each language.
+    /// </summary>
+    /// <remarks>
+    /// Preprocessors must be separated with spaces.
+    /// </remarks>
+    protected virtual string Preprocessors
+    {
+      get
+      {
+        return "";
+      }
+    }
 
-        /// <summary/>
-        protected CodeFormat()
-        {
-            //generate the keyword and preprocessor regexes from the keyword lists
-            Regex r;
-            r = new Regex(@"\w+|-\w+|#\w+|@@\w+|#(?:\\(?:s|w)(?:\*|\+)?\w+)+|@\\w\*+");
-            string regKeyword = r.Replace(Keywords, @"(?<=^|\W)$0(?=\W)");
-            string regPreproc = r.Replace(Preprocessors, @"(?<=^|\s)$0(?=\s|$)");
-            r = new Regex(@" +");
-            regKeyword = r.Replace(regKeyword, @"|");
-            regPreproc = r.Replace(regPreproc, @"|");
-
-            if (regPreproc.Length == 0)
-            {
-                regPreproc = "(?!.*)_{37}(?<!.*)"; //use something quite impossible...
-            }
-
-            //build a master regex with capturing groups
-            StringBuilder regAll = new StringBuilder();
-            regAll.Append("(");
-            regAll.Append(CommentRegEx);
-            regAll.Append(")|(");
-            regAll.Append(StringRegEx);
-            if (regPreproc.Length > 0)
-            {
-                regAll.Append(")|(");
-                regAll.Append(regPreproc);
-            }
-            regAll.Append(")|(");
-            regAll.Append(regKeyword);
-            regAll.Append(")");
-
-            RegexOptions caseInsensitive = CaseSensitive ? 0 : RegexOptions.IgnoreCase;
-            CodeRegex = new Regex(regAll.ToString(), RegexOptions.Singleline | caseInsensitive);
-
-            CodeParagraphGlobal = new List<Run>();
-        }
+    /// <summary>
+    /// Must be overridden to provide a regular expression string
+    /// to match strings literals. 
+    /// </summary>
+    protected abstract string StringRegEx
+    {
+      get;
+    }
 
-        /// <summary>
-        /// Called to evaluate the HTML fragment corresponding to each 
-        /// matching token in the code.
-        /// </summary>
-        /// <param name="match">The <see cref="Match"/> resulting from a 
-        /// single regular expression match.</param>
-        /// <returns>A string containing the HTML code fragment.</returns>
-        protected override string MatchEval(Match match) //protected override
-        {
-            if (match.Groups[1].Success) //comment
-            {
-                StringReader reader = new StringReader(match.ToString());
-                string line;
-                StringBuilder sb = new StringBuilder();
-                while ((line = reader.ReadLine()) != null)
-                {
-                    Run r = new Run(line);
-                    r.Foreground = new SolidColorBrush(Color.FromRgb(0, 128, 0));
-
-                    CodeParagraphGlobal.Add(r);
-                }
-                return "::::::";
-            }
-            else if (match.Groups[2].Success) //string literal
-            {
-                Run r = new Run(match.ToString());
-                r.Foreground = new SolidColorBrush(Color.FromRgb(0, 96, 128));
-
-                CodeParagraphGlobal.Add(r);
-                return "::::::";
-            }
-            else if (match.Groups[3].Success) //preprocessor keyword
-            {
-                Run r = new Run(match.ToString());
-                r.Foreground = new SolidColorBrush(Color.FromRgb(204, 102, 51));
-
-                CodeParagraphGlobal.Add(r);
-                return "::::::";
-            }
-            else if (match.Groups[4].Success) //keyword
-            {
-                Run r = new Run(match.ToString());
-                r.Foreground = new SolidColorBrush(Color.FromRgb(0, 0, 255));
-
-                CodeParagraphGlobal.Add(r);
-                return "::::::";
-            }
-            else
-            {
-                return "";
-            }
-        }
+    /// <summary>
+    /// Must be overridden to provide a regular expression string
+    /// to match comments. 
+    /// </summary>
+    protected abstract string CommentRegEx
+    {
+      get;
     }
 
     /// <summary>
-    ///	Provides a base implementation for all code formatters.
+    /// Determines if the language is case sensitive.
     /// </summary>
+    /// <value><b>true</b> if the language is case sensitive, <b>false</b> 
+    /// otherwise. The default is true.</value>
     /// <remarks>
-    /// <para>
-    /// To display the formatted code on your web site, the web page must 
-    /// refer to a stylesheet that defines the formatting for the different 
-    /// CSS classes generated by CSharpFormat:
-    /// .csharpcode, pre, .rem, .kwrd, .str, .op, .preproc, .alt, .lnum.
-    /// </para>
-    /// <para>
-    /// Note that if you have multi-line comments in your source code
-    /// (like /* ... */), the "line numbers" or "alternate line background" 
-    /// options will generate code that is not strictly HTML 4.01 compliant. 
-    /// The code will still look good with IE5+ or Mozilla 0.8+. 
-    /// </para>
+    /// A case-insensitive language formatter must override this 
+    /// property to return false.
     /// </remarks>
-    public abstract class SourceFormat
+    public virtual bool CaseSensitive
     {
-        /// <summary/>
-        protected SourceFormat()
-        {
-            _tabSpaces = 4;
-            _lineNumbers = false;
-            _alternate = false;
-            _embedStyleSheet = false;
-        }
+      get
+      {
+        return true;
+      }
+    }
 
-        private byte _tabSpaces;
+    /// <summary/>
+    protected CodeFormat()
+    {
+      //generate the keyword and preprocessor regexes from the keyword lists
+      Regex r;
+      r = new Regex( @"\w+|-\w+|#\w+|@@\w+|#(?:\\(?:s|w)(?:\*|\+)?\w+)+|@\\w\*+" );
+      string regKeyword = r.Replace( Keywords, @"(?<=^|\W)$0(?=\W)" );
+      string regPreproc = r.Replace( Preprocessors, @"(?<=^|\s)$0(?=\s|$)" );
+      r = new Regex( @" +" );
+      regKeyword = r.Replace( regKeyword, @"|" );
+      regPreproc = r.Replace( regPreproc, @"|" );
+
+      if( regPreproc.Length == 0 )
+      {
+        regPreproc = "(?!.*)_{37}(?<!.*)"; //use something quite impossible...
+      }
+
+      //build a master regex with capturing groups
+      StringBuilder regAll = new StringBuilder();
+      regAll.Append( "(" );
+      regAll.Append( CommentRegEx );
+      regAll.Append( ")|(" );
+      regAll.Append( StringRegEx );
+      if( regPreproc.Length > 0 )
+      {
+        regAll.Append( ")|(" );
+        regAll.Append( regPreproc );
+      }
+      regAll.Append( ")|(" );
+      regAll.Append( regKeyword );
+      regAll.Append( ")" );
+
+      RegexOptions caseInsensitive = CaseSensitive ? 0 : RegexOptions.IgnoreCase;
+      CodeRegex = new Regex( regAll.ToString(), RegexOptions.Singleline | caseInsensitive );
+
+      CodeParagraphGlobal = new List<Run>();
+    }
 
-        /// <summary>
-        /// Gets or sets the tabs width.
-        /// </summary>
-        /// <value>The number of space characters to substitute for tab 
-        /// characters. The default is <b>4</b>, unless overridden is a 
-        /// derived class.</value>
-        public byte TabSpaces
+    /// <summary>
+    /// Called to evaluate the HTML fragment corresponding to each 
+    /// matching token in the code.
+    /// </summary>
+    /// <param name="match">The <see cref="Match"/> resulting from a 
+    /// single regular expression match.</param>
+    /// <returns>A string containing the HTML code fragment.</returns>
+    protected override string MatchEval( Match match ) //protected override
+    {
+      if( match.Groups[ 1 ].Success ) //comment
+      {
+        StringReader reader = new StringReader( match.ToString() );
+        string line;
+        StringBuilder sb = new StringBuilder();
+        while( ( line = reader.ReadLine() ) != null )
         {
-            get { return _tabSpaces; }
-            set { _tabSpaces = value; }
+          Run r = new Run( line );
+          r.Foreground = new SolidColorBrush( Color.FromRgb( 0, 128, 0 ) );
+
+          CodeParagraphGlobal.Add( r );
         }
+        return "::::::";
+      }
+      else if( match.Groups[ 2 ].Success ) //string literal
+      {
+        Run r = new Run( match.ToString() );
+        r.Foreground = new SolidColorBrush( Color.FromRgb( 0, 96, 128 ) );
+
+        CodeParagraphGlobal.Add( r );
+        return "::::::";
+      }
+      else if( match.Groups[ 3 ].Success ) //preprocessor keyword
+      {
+        Run r = new Run( match.ToString() );
+        r.Foreground = new SolidColorBrush( Color.FromRgb( 204, 102, 51 ) );
+
+        CodeParagraphGlobal.Add( r );
+        return "::::::";
+      }
+      else if( match.Groups[ 4 ].Success ) //keyword
+      {
+        Run r = new Run( match.ToString() );
+        r.Foreground = new SolidColorBrush( Color.FromRgb( 0, 0, 255 ) );
+
+        CodeParagraphGlobal.Add( r );
+        return "::::::";
+      }
+      else
+      {
+        return "";
+      }
+    }
+  }
+
+  /// <summary>
+  ///	Provides a base implementation for all code formatters.
+  /// </summary>
+  /// <remarks>
+  /// <para>
+  /// To display the formatted code on your web site, the web page must 
+  /// refer to a stylesheet that defines the formatting for the different 
+  /// CSS classes generated by CSharpFormat:
+  /// .csharpcode, pre, .rem, .kwrd, .str, .op, .preproc, .alt, .lnum.
+  /// </para>
+  /// <para>
+  /// Note that if you have multi-line comments in your source code
+  /// (like /* ... */), the "line numbers" or "alternate line background" 
+  /// options will generate code that is not strictly HTML 4.01 compliant. 
+  /// The code will still look good with IE5+ or Mozilla 0.8+. 
+  /// </para>
+  /// </remarks>
+  public abstract class SourceFormat
+  {
+    /// <summary/>
+    protected SourceFormat()
+    {
+      _tabSpaces = 4;
+      _lineNumbers = false;
+      _alternate = false;
+      _embedStyleSheet = false;
+    }
 
-        private bool _lineNumbers;
+    private byte _tabSpaces;
 
-        /// <summary>
-        /// Enables or disables line numbers in output.
-        /// </summary>
-        /// <value>When <b>true</b>, line numbers are generated. 
-        /// The default is <b>false</b>.</value>
-        public bool LineNumbers
-        {
-            get { return _lineNumbers; }
-            set { _lineNumbers = value; }
-        }
+    /// <summary>
+    /// Gets or sets the tabs width.
+    /// </summary>
+    /// <value>The number of space characters to substitute for tab 
+    /// characters. The default is <b>4</b>, unless overridden is a 
+    /// derived class.</value>
+    public byte TabSpaces
+    {
+      get
+      {
+        return _tabSpaces;
+      }
+      set
+      {
+        _tabSpaces = value;
+      }
+    }
 
-        private bool _alternate;
+    private bool _lineNumbers;
 
-        /// <summary>
-        /// Enables or disables alternating line background.
-        /// </summary>
-        /// <value>When <b>true</b>, lines background is alternated. 
-        /// The default is <b>false</b>.</value>
-        public bool Alternate
-        {
-            get { return _alternate; }
-            set { _alternate = value; }
-        }
+    /// <summary>
+    /// Enables or disables line numbers in output.
+    /// </summary>
+    /// <value>When <b>true</b>, line numbers are generated. 
+    /// The default is <b>false</b>.</value>
+    public bool LineNumbers
+    {
+      get
+      {
+        return _lineNumbers;
+      }
+      set
+      {
+        _lineNumbers = value;
+      }
+    }
 
-        private bool _embedStyleSheet;
+    private bool _alternate;
 
-        /// <summary>
-        /// Enables or disables the embedded CSS style sheet.
-        /// </summary>
-        /// <value>When <b>true</b>, the CSS &lt;style&gt; element is included 
-        /// in the HTML output. The default is <b>false</b>.</value>
-        public bool EmbedStyleSheet
-        {
-            get { return _embedStyleSheet; }
-            set { _embedStyleSheet = value; }
-        }
+    /// <summary>
+    /// Enables or disables alternating line background.
+    /// </summary>
+    /// <value>When <b>true</b>, lines background is alternated. 
+    /// The default is <b>false</b>.</value>
+    public bool Alternate
+    {
+      get
+      {
+        return _alternate;
+      }
+      set
+      {
+        _alternate = value;
+      }
+    }
 
-        /// <summary>
-        /// Transforms a source code string to HTML 4.01.
-        /// </summary>
-        /// <returns>A string containing the HTML formatted code.</returns>
-        public Paragraph FormatCode(string source)
-        {
-            return FormatCode(source, _lineNumbers, _alternate, _embedStyleSheet, false);
-        }
+    private bool _embedStyleSheet;
 
-        private Regex codeRegex;
+    /// <summary>
+    /// Enables or disables the embedded CSS style sheet.
+    /// </summary>
+    /// <value>When <b>true</b>, the CSS &lt;style&gt; element is included 
+    /// in the HTML output. The default is <b>false</b>.</value>
+    public bool EmbedStyleSheet
+    {
+      get
+      {
+        return _embedStyleSheet;
+      }
+      set
+      {
+        _embedStyleSheet = value;
+      }
+    }
 
-        /// <summary>
-        /// The regular expression used to capture language tokens.
-        /// </summary>
-        protected Regex CodeRegex
-        {
-            get { return codeRegex; }
-            set { codeRegex = value; }
-        }
+    /// <summary>
+    /// Transforms a source code string to HTML 4.01.
+    /// </summary>
+    /// <returns>A string containing the HTML formatted code.</returns>
+    public Paragraph FormatCode( string source )
+    {
+      return FormatCode( source, _lineNumbers, _alternate, _embedStyleSheet, false );
+    }
 
-        private List<Run> codeParagraphGlobal;
-        /// <summary>
-        /// This is a List of Run's that can be added later to the string of code
-        /// </summary>
-        protected List<Run> CodeParagraphGlobal
-        {
-            get { return codeParagraphGlobal; }
-            set { codeParagraphGlobal = value; }
-        }
+    private Regex codeRegex;
 
-        /// <summary>
-        /// Called to evaluate the HTML fragment corresponding to each 
-        /// matching token in the code.
-        /// </summary>
-        /// <param name="match">The <see cref="Match"/> resulting from a 
-        /// single regular expression match.</param>
-        /// <returns>A string containing the HTML code fragment.</returns>
-        protected abstract string MatchEval(Match match); //protected abstract
-
-        //does the formatting job
-        private Paragraph FormatCode(string source, bool lineNumbers,
-            bool alternate, bool embedStyleSheet, bool subCode)
+    /// <summary>
+    /// The regular expression used to capture language tokens.
+    /// </summary>
+    protected Regex CodeRegex
+    {
+      get
+      {
+        return codeRegex;
+      }
+      set
+      {
+        codeRegex = value;
+      }
+    }
+
+    private List<Run> codeParagraphGlobal;
+    /// <summary>
+    /// This is a List of Run's that can be added later to the string of code
+    /// </summary>
+    protected List<Run> CodeParagraphGlobal
+    {
+      get
+      {
+        return codeParagraphGlobal;
+      }
+      set
+      {
+        codeParagraphGlobal = value;
+      }
+    }
+
+    /// <summary>
+    /// Called to evaluate the HTML fragment corresponding to each 
+    /// matching token in the code.
+    /// </summary>
+    /// <param name="match">The <see cref="Match"/> resulting from a 
+    /// single regular expression match.</param>
+    /// <returns>A string containing the HTML code fragment.</returns>
+    protected abstract string MatchEval( Match match ); //protected abstract
+
+    //does the formatting job
+    private Paragraph FormatCode( string source, bool lineNumbers,
+        bool alternate, bool embedStyleSheet, bool subCode )
+    {
+      Paragraph codeParagraph = new Paragraph();
+      //replace special characters
+      StringBuilder sb = new StringBuilder( source );
+      //color the code
+      source = codeRegex.Replace( sb.ToString(), new MatchEvaluator( this.MatchEval ) );
+      //codeRegex.Replace(
+      string[] characters = { "::::::" };
+
+      string[] split = source.Split( characters, new StringSplitOptions() );
+      int currentChunk = 0;
+      foreach( string code in split )
+      {
+        currentChunk++;
+        Run r = new Run( code );
+        codeParagraph.Inlines.Add( r );
+        if( ( currentChunk - 1 ) < codeParagraphGlobal.Count )
         {
-            Paragraph codeParagraph = new Paragraph();
-            //replace special characters
-            StringBuilder sb = new StringBuilder(source);
-            //color the code
-            source = codeRegex.Replace(sb.ToString(), new MatchEvaluator(this.MatchEval));
-            //codeRegex.Replace(
-            string[] characters = { "::::::" };
-
-            string[] split = source.Split(characters, new StringSplitOptions());
-            int currentChunk = 0;
-            foreach (string code in split)
-            {
-                currentChunk++;
-                Run r = new Run(code);
-                codeParagraph.Inlines.Add(r);
-                if ((currentChunk - 1) < codeParagraphGlobal.Count)
-                {
-                    codeParagraph.Inlines.Add(codeParagraphGlobal[currentChunk - 1]);
-                }
-            }
-
-            return codeParagraph;
+          codeParagraph.Inlines.Add( codeParagraphGlobal[ currentChunk - 1 ] );
         }
+      }
 
+      return codeParagraph;
     }
+
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/XamlFormat.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/XamlFormat.cs
index 926b3df2..8e71b297 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/XamlFormat.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Core/CodeFormatting/XamlFormat.cs
@@ -1,351 +1,350 @@
 //Author: Nick Kramer [MSFT]
 //Source: http://blogs.msdn.com/b/nickkramer/archive/2006/09/22/766934.aspx
 
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
 namespace Samples.Infrastructure.Core.CodeFormatting
 {
-    // XML tokenizer, tokens are designed to match Visual Studio syntax highlighting
-    class XmlTokenizer
+  // XML tokenizer, tokens are designed to match Visual Studio syntax highlighting
+  class XmlTokenizer
+  {
+    private string input;
+    private int position = 0;
+    private XmlTokenizerMode mode = XmlTokenizerMode.OutsideElement;
+    public static List<XmlToken> Tokenize( string input )
     {
-        private string input;
-        private int position = 0;
-        private XmlTokenizerMode mode = XmlTokenizerMode.OutsideElement;
-        public static List<XmlToken> Tokenize(string input)
-        {
-            XmlTokenizerMode mode = XmlTokenizerMode.OutsideElement;
-            XmlTokenizer tokenizer = new XmlTokenizer();
-            return tokenizer.Tokenize(input, ref mode);
-        }
-        public List<XmlToken> Tokenize(string input, ref XmlTokenizerMode _mode)
-        {
-            this.input = input;
-            this.mode = _mode;
-            this.position = 0;
-            List<XmlToken> result = Tokenize();
-            _mode = this.mode;
-            return result;
-        }
-        private List<XmlToken> Tokenize()
-        {
-            List<XmlToken> list = new List<XmlToken>();
-            XmlToken token;
-            do
-            {
-                int previousPosition = position;
-                token = NextToken();
-                string tokenText = input.Substring(previousPosition, token.Length);
-                list.Add(token);
-            }
-            while (token.Kind != XmlTokenKind.EOF);
-            List<string> strings = TokensToStrings(list, input);
-            return list;
-        }
-        private List<string> TokensToStrings(List<XmlToken> list, string input)
-        {
-            List<string> output = new List<string>();
-            int position = 0;
-            foreach (XmlToken token in list)
-            {
-                output.Add(input.Substring(position, token.Length));
-                position += token.Length;
-            }
-            return output;
-        }
-        // debugging function
-        public string RemainingText
-        {
-            get
-            {
-                return input.Substring(position);
-            }
-        }
-        private XmlToken NextToken()
-        {
-            if (position >= input.Length)
-                return new XmlToken(XmlTokenKind.EOF, 0);
-            XmlToken token;
-            switch (mode)
-            {
-                case XmlTokenizerMode.AfterAttributeEquals:
-                    token = TokenizeAttributeValue();
-                    break;
-                case XmlTokenizerMode.AfterAttributeName:
-                    token = TokenizeSimple("=", XmlTokenKind.Equals, XmlTokenizerMode.AfterAttributeEquals);
-                    break;
-                case XmlTokenizerMode.AfterOpen:
-                    token = TokenizeName(XmlTokenKind.ElementName, XmlTokenizerMode.InsideElement);
-                    break;
-                case XmlTokenizerMode.InsideCData:
-                    token = TokenizeInsideCData();
-                    break;
-                case XmlTokenizerMode.InsideComment:
-                    token = TokenizeInsideComment();
-                    break;
-                case XmlTokenizerMode.InsideElement:
-                    token = TokenizeInsideElement();
-                    break;
-                case XmlTokenizerMode.InsideProcessingInstruction:
-                    token = TokenizeInsideProcessingInstruction();
-                    break;
-                case XmlTokenizerMode.OutsideElement:
-                    token = TokenizeOutsideElement();
-                    break;
-                default:
-                    token = new XmlToken(XmlTokenKind.EOF, 0);
-                    Debug.Fail("missing case");
-                    break;
-            }
-            return token;
-        }
-        private bool IsNameCharacter(char character)
-        {
-            // XML rule: Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender
-            bool result = char.IsLetterOrDigit(character) || character == '.' | character == '-' | character == '_' | character == ':';
-            return result;
-        }
-        private XmlToken TokenizeAttributeValue()
-        {
-            Debug.Assert(mode == XmlTokenizerMode.AfterAttributeEquals);
-            int closePosition = input.IndexOf(input[position], position + 1);
-            XmlToken token = new XmlToken(XmlTokenKind.AttributeValue, closePosition + 1 - position);
-            position = closePosition + 1;
-            mode = XmlTokenizerMode.InsideElement;
-            return token;
-        }
-        private XmlToken TokenizeName(XmlTokenKind kind, XmlTokenizerMode nextMode)
-        {
-            Debug.Assert(mode == XmlTokenizerMode.AfterOpen || mode == XmlTokenizerMode.InsideElement);
-            int i;
-            for (i = position; i < input.Length; i++)
-                if (!IsNameCharacter(input[i]))
-                    break;
-            XmlToken token = new XmlToken(kind, i - position);
-            mode = nextMode;
-            position = i;
-            return token;
-        }
-        private XmlToken TokenizeElementWhitespace()
-        {
-            int i;
-            for (i = position; i < input.Length; i++)
-                if (!char.IsWhiteSpace(input[i]))
-                    break;
-            XmlToken token = new XmlToken(XmlTokenKind.ElementWhitespace, i - position);
-            position = i;
-            return token;
-        }
-        private bool StartsWith(string text)
-        {
-            if (position + text.Length > input.Length)
-                return false;
-            else
-                return input.Substring(position, text.Length) == text;
-        }
-        private XmlToken TokenizeInsideElement()
-        {
-            if (char.IsWhiteSpace(input[position]))
-                return TokenizeElementWhitespace();
-            else
-                if (StartsWith("/>"))
-                    return TokenizeSimple("/>", XmlTokenKind.SelfClose, XmlTokenizerMode.OutsideElement);
-                else
-                    if (StartsWith(">"))
-                        return TokenizeSimple(">", XmlTokenKind.Close, XmlTokenizerMode.OutsideElement);
-                    else
-                        return TokenizeName(XmlTokenKind.AttributeName, XmlTokenizerMode.AfterAttributeName);
-        }
-        private XmlToken TokenizeText()
-        {
-            Debug.Assert(input[position] != '<');
-            Debug.Assert(input[position] != '&');
-            Debug.Assert(mode == XmlTokenizerMode.OutsideElement);
-            int i;
-            for (i = position; i < input.Length; i++)
-                if (input[i] == '<' || input[i] == '&')
-                    break;
-            XmlToken token = new XmlToken(XmlTokenKind.TextContent, i - position);
-            position = i;
-            return token;
-        }
-        private XmlToken TokenizeOutsideElement()
-        {
-            Debug.Assert(mode == XmlTokenizerMode.OutsideElement);
-            if (position >= input.Length)
-                return new XmlToken(XmlTokenKind.EOF, 0);
-            switch (input[position])
-            {
-                case '<':
-                    return TokenizeOpen();
-                case '&':
-                    return TokenizeEntity();
-                default:
-                    return TokenizeText();
-            }
-        }
-        private XmlToken TokenizeSimple(string text, XmlTokenKind kind, XmlTokenizerMode nextMode)
-        {
-            XmlToken token = new XmlToken(kind, text.Length);
-            position += text.Length;
-            mode = nextMode;
-            return token;
-        }
-        private XmlToken TokenizeOpen()
-        {
-            Debug.Assert(input[position] == '<');
-            if (StartsWith("<!--"))
-                return TokenizeSimple("<!--", XmlTokenKind.CommentBegin, XmlTokenizerMode.InsideComment);
-            else
-                if (StartsWith("<![CDATA["))
-                    return TokenizeSimple("<![CDATA[", XmlTokenKind.CDataBegin, XmlTokenizerMode.InsideCData);
-                else
-                    if (StartsWith("<?"))
-                        return TokenizeSimple("<?", XmlTokenKind.OpenProcessingInstruction, XmlTokenizerMode.InsideProcessingInstruction);
-                    else
-                        if (StartsWith("</"))
-                            return TokenizeSimple("</", XmlTokenKind.OpenClose, XmlTokenizerMode.AfterOpen);
-                        else
-                            return TokenizeSimple("<", XmlTokenKind.Open, XmlTokenizerMode.AfterOpen);
-        }
-        private XmlToken TokenizeEntity()
-        {
-            Debug.Assert(mode == XmlTokenizerMode.OutsideElement);
-            Debug.Assert(input[position] == '&');
-            XmlToken token = new XmlToken(XmlTokenKind.Entity, input.IndexOf(';', position) - position);
-            position += token.Length;
-            return token;
-        }
-        private XmlToken TokenizeInsideProcessingInstruction()
-        {
-            Debug.Assert(mode == XmlTokenizerMode.InsideProcessingInstruction);
-            int tokenend = input.IndexOf("?>", position);
-            if (position == tokenend)
-            {
-                position += "?>".Length;
-                mode = XmlTokenizerMode.OutsideElement;
-                return new XmlToken(XmlTokenKind.CloseProcessingInstruction, "?>".Length);
-            }
-            else
-            {
-                XmlToken token = new XmlToken(XmlTokenKind.TextContent, tokenend - position);
-                position = tokenend;
-                return token;
-            }
-        }
-        private XmlToken TokenizeInsideCData()
-        {
-            Debug.Assert(mode == XmlTokenizerMode.InsideCData);
-            int tokenend = input.IndexOf("]]>", position);
-            if (position == tokenend)
-            {
-                position += "]]>".Length;
-                mode = XmlTokenizerMode.OutsideElement;
-                return new XmlToken(XmlTokenKind.CDataEnd, "]]>".Length);
-            }
-            else
-            {
-                XmlToken token = new XmlToken(XmlTokenKind.TextContent, tokenend - position);
-                position = tokenend;
-                return token;
-            }
-        }
-        private XmlToken TokenizeInsideComment()
-        {
-            Debug.Assert(mode == XmlTokenizerMode.InsideComment);
-            int tokenend = input.IndexOf("-->", position);
-            if (position == tokenend)
-            {
-                position += "-->".Length;
-                mode = XmlTokenizerMode.OutsideElement;
-                return new XmlToken(XmlTokenKind.CommentEnd, "-->".Length);
-            }
+      XmlTokenizerMode mode = XmlTokenizerMode.OutsideElement;
+      XmlTokenizer tokenizer = new XmlTokenizer();
+      return tokenizer.Tokenize( input, ref mode );
+    }
+    public List<XmlToken> Tokenize( string input, ref XmlTokenizerMode _mode )
+    {
+      this.input = input;
+      this.mode = _mode;
+      this.position = 0;
+      List<XmlToken> result = Tokenize();
+      _mode = this.mode;
+      return result;
+    }
+    private List<XmlToken> Tokenize()
+    {
+      List<XmlToken> list = new List<XmlToken>();
+      XmlToken token;
+      do
+      {
+        int previousPosition = position;
+        token = NextToken();
+        string tokenText = input.Substring( previousPosition, token.Length );
+        list.Add( token );
+      }
+      while( token.Kind != XmlTokenKind.EOF );
+      List<string> strings = TokensToStrings( list, input );
+      return list;
+    }
+    private List<string> TokensToStrings( List<XmlToken> list, string input )
+    {
+      List<string> output = new List<string>();
+      int position = 0;
+      foreach( XmlToken token in list )
+      {
+        output.Add( input.Substring( position, token.Length ) );
+        position += token.Length;
+      }
+      return output;
+    }
+    // debugging function
+    public string RemainingText
+    {
+      get
+      {
+        return input.Substring( position );
+      }
+    }
+    private XmlToken NextToken()
+    {
+      if( position >= input.Length )
+        return new XmlToken( XmlTokenKind.EOF, 0 );
+      XmlToken token;
+      switch( mode )
+      {
+        case XmlTokenizerMode.AfterAttributeEquals:
+          token = TokenizeAttributeValue();
+          break;
+        case XmlTokenizerMode.AfterAttributeName:
+          token = TokenizeSimple( "=", XmlTokenKind.Equals, XmlTokenizerMode.AfterAttributeEquals );
+          break;
+        case XmlTokenizerMode.AfterOpen:
+          token = TokenizeName( XmlTokenKind.ElementName, XmlTokenizerMode.InsideElement );
+          break;
+        case XmlTokenizerMode.InsideCData:
+          token = TokenizeInsideCData();
+          break;
+        case XmlTokenizerMode.InsideComment:
+          token = TokenizeInsideComment();
+          break;
+        case XmlTokenizerMode.InsideElement:
+          token = TokenizeInsideElement();
+          break;
+        case XmlTokenizerMode.InsideProcessingInstruction:
+          token = TokenizeInsideProcessingInstruction();
+          break;
+        case XmlTokenizerMode.OutsideElement:
+          token = TokenizeOutsideElement();
+          break;
+        default:
+          token = new XmlToken( XmlTokenKind.EOF, 0 );
+          Debug.Fail( "missing case" );
+          break;
+      }
+      return token;
+    }
+    private bool IsNameCharacter( char character )
+    {
+      // XML rule: Letter | Digit | '.' | '-' | '_' | ':' | CombiningChar | Extender
+      bool result = char.IsLetterOrDigit( character ) || character == '.' | character == '-' | character == '_' | character == ':';
+      return result;
+    }
+    private XmlToken TokenizeAttributeValue()
+    {
+      Debug.Assert( mode == XmlTokenizerMode.AfterAttributeEquals );
+      int closePosition = input.IndexOf( input[ position ], position + 1 );
+      XmlToken token = new XmlToken( XmlTokenKind.AttributeValue, closePosition + 1 - position );
+      position = closePosition + 1;
+      mode = XmlTokenizerMode.InsideElement;
+      return token;
+    }
+    private XmlToken TokenizeName( XmlTokenKind kind, XmlTokenizerMode nextMode )
+    {
+      Debug.Assert( mode == XmlTokenizerMode.AfterOpen || mode == XmlTokenizerMode.InsideElement );
+      int i;
+      for( i = position; i < input.Length; i++ )
+        if( !IsNameCharacter( input[ i ] ) )
+          break;
+      XmlToken token = new XmlToken( kind, i - position );
+      mode = nextMode;
+      position = i;
+      return token;
+    }
+    private XmlToken TokenizeElementWhitespace()
+    {
+      int i;
+      for( i = position; i < input.Length; i++ )
+        if( !char.IsWhiteSpace( input[ i ] ) )
+          break;
+      XmlToken token = new XmlToken( XmlTokenKind.ElementWhitespace, i - position );
+      position = i;
+      return token;
+    }
+    private bool StartsWith( string text )
+    {
+      if( position + text.Length > input.Length )
+        return false;
+      else
+        return input.Substring( position, text.Length ) == text;
+    }
+    private XmlToken TokenizeInsideElement()
+    {
+      if( char.IsWhiteSpace( input[ position ] ) )
+        return TokenizeElementWhitespace();
+      else
+        if( StartsWith( "/>" ) )
+          return TokenizeSimple( "/>", XmlTokenKind.SelfClose, XmlTokenizerMode.OutsideElement );
+        else
+          if( StartsWith( ">" ) )
+            return TokenizeSimple( ">", XmlTokenKind.Close, XmlTokenizerMode.OutsideElement );
+          else
+            return TokenizeName( XmlTokenKind.AttributeName, XmlTokenizerMode.AfterAttributeName );
+    }
+    private XmlToken TokenizeText()
+    {
+      Debug.Assert( input[ position ] != '<' );
+      Debug.Assert( input[ position ] != '&' );
+      Debug.Assert( mode == XmlTokenizerMode.OutsideElement );
+      int i;
+      for( i = position; i < input.Length; i++ )
+        if( input[ i ] == '<' || input[ i ] == '&' )
+          break;
+      XmlToken token = new XmlToken( XmlTokenKind.TextContent, i - position );
+      position = i;
+      return token;
+    }
+    private XmlToken TokenizeOutsideElement()
+    {
+      Debug.Assert( mode == XmlTokenizerMode.OutsideElement );
+      if( position >= input.Length )
+        return new XmlToken( XmlTokenKind.EOF, 0 );
+      switch( input[ position ] )
+      {
+        case '<':
+          return TokenizeOpen();
+        case '&':
+          return TokenizeEntity();
+        default:
+          return TokenizeText();
+      }
+    }
+    private XmlToken TokenizeSimple( string text, XmlTokenKind kind, XmlTokenizerMode nextMode )
+    {
+      XmlToken token = new XmlToken( kind, text.Length );
+      position += text.Length;
+      mode = nextMode;
+      return token;
+    }
+    private XmlToken TokenizeOpen()
+    {
+      Debug.Assert( input[ position ] == '<' );
+      if( StartsWith( "<!--" ) )
+        return TokenizeSimple( "<!--", XmlTokenKind.CommentBegin, XmlTokenizerMode.InsideComment );
+      else
+        if( StartsWith( "<![CDATA[" ) )
+          return TokenizeSimple( "<![CDATA[", XmlTokenKind.CDataBegin, XmlTokenizerMode.InsideCData );
+        else
+          if( StartsWith( "<?" ) )
+            return TokenizeSimple( "<?", XmlTokenKind.OpenProcessingInstruction, XmlTokenizerMode.InsideProcessingInstruction );
+          else
+            if( StartsWith( "</" ) )
+              return TokenizeSimple( "</", XmlTokenKind.OpenClose, XmlTokenizerMode.AfterOpen );
             else
-            {
-                XmlToken token = new XmlToken(XmlTokenKind.CommentText, tokenend - position);
-                position = tokenend;
-                return token;
-            }
-        }
+              return TokenizeSimple( "<", XmlTokenKind.Open, XmlTokenizerMode.AfterOpen );
     }
-
-    // Used so you can restart the tokenizer for the next line of XML
-    enum XmlTokenizerMode
+    private XmlToken TokenizeEntity()
     {
-        InsideComment,
-        InsideProcessingInstruction,
-        AfterOpen,
-        AfterAttributeName,
-        AfterAttributeEquals,
-        InsideElement,
-        // after element name, before attribute or />
-        OutsideElement,
-        InsideCData
+      Debug.Assert( mode == XmlTokenizerMode.OutsideElement );
+      Debug.Assert( input[ position ] == '&' );
+      XmlToken token = new XmlToken( XmlTokenKind.Entity, input.IndexOf( ';', position ) - position );
+      position += token.Length;
+      return token;
     }
-
-    struct XmlToken
+    private XmlToken TokenizeInsideProcessingInstruction()
+    {
+      Debug.Assert( mode == XmlTokenizerMode.InsideProcessingInstruction );
+      int tokenend = input.IndexOf( "?>", position );
+      if( position == tokenend )
+      {
+        position += "?>".Length;
+        mode = XmlTokenizerMode.OutsideElement;
+        return new XmlToken( XmlTokenKind.CloseProcessingInstruction, "?>".Length );
+      }
+      else
+      {
+        XmlToken token = new XmlToken( XmlTokenKind.TextContent, tokenend - position );
+        position = tokenend;
+        return token;
+      }
+    }
+    private XmlToken TokenizeInsideCData()
+    {
+      Debug.Assert( mode == XmlTokenizerMode.InsideCData );
+      int tokenend = input.IndexOf( "]]>", position );
+      if( position == tokenend )
+      {
+        position += "]]>".Length;
+        mode = XmlTokenizerMode.OutsideElement;
+        return new XmlToken( XmlTokenKind.CDataEnd, "]]>".Length );
+      }
+      else
+      {
+        XmlToken token = new XmlToken( XmlTokenKind.TextContent, tokenend - position );
+        position = tokenend;
+        return token;
+      }
+    }
+    private XmlToken TokenizeInsideComment()
     {
-        public XmlTokenKind Kind;
-        public short Length;
-        public XmlToken(XmlTokenKind kind, int length)
-        {
-            Kind = kind;
-            Length = (short)length;
-        }
+      Debug.Assert( mode == XmlTokenizerMode.InsideComment );
+      int tokenend = input.IndexOf( "-->", position );
+      if( position == tokenend )
+      {
+        position += "-->".Length;
+        mode = XmlTokenizerMode.OutsideElement;
+        return new XmlToken( XmlTokenKind.CommentEnd, "-->".Length );
+      }
+      else
+      {
+        XmlToken token = new XmlToken( XmlTokenKind.CommentText, tokenend - position );
+        position = tokenend;
+        return token;
+      }
     }
+  }
 
-    /*
-        * this file implements a mostly correct XML tokenizer.  The token boundaries
-        * have been chosen to match Visual Studio syntax highlighting, so a few of 
-        * the boundaries are little weird.  (Especially comments) known issues:
-        * 
-        * Doesn't handle DTD's
-        * mediocre handling of processing instructions <? ?> -- it won't crash, 
-        *      but the token boundaries are wrong
-        * Doesn't enforce correct XML
-        * there's probably a few cases where it will die if given in valid XML
-        * 
-        * 
-        * This tokenizer has been designed to be restartable, so you can tokenize
-        * one line of XML at a time.
-        */
-    enum XmlTokenKind
+  // Used so you can restart the tokenizer for the next line of XML
+  enum XmlTokenizerMode
+  {
+    InsideComment,
+    InsideProcessingInstruction,
+    AfterOpen,
+    AfterAttributeName,
+    AfterAttributeEquals,
+    InsideElement,
+    // after element name, before attribute or />
+    OutsideElement,
+    InsideCData
+  }
+
+  struct XmlToken
+  {
+    public XmlTokenKind Kind;
+    public short Length;
+    public XmlToken( XmlTokenKind kind, int length )
     {
-        Open,
-        // <
-        Close,
-        //>
-        SelfClose,
-        // />
-        OpenClose,
-        // </
-        ElementName,
-        ElementWhitespace,
-        //whitespace between attributes
-        AttributeName,
-        Equals,
-        // inside attribute
-        AttributeValue,
-        // attribute value
-        CommentBegin,
-        // <!--
-        CommentText,
-        CommentEnd,
-        // -->
-        Entity,
-        // &gt;
-        OpenProcessingInstruction,
-        // <?
-        CloseProcessingInstruction,
-        // ?>
-        CDataBegin,
-        // <![CDATA[
-        CDataEnd,
-        // ]]>
-        TextContent,
-        //WhitespaceContent, // text content that's whitespace.  Space is embedded inside
-        EOF,
-        // end of file
+      Kind = kind;
+      Length = ( short )length;
     }
+  }
+
+  /*
+      * this file implements a mostly correct XML tokenizer.  The token boundaries
+      * have been chosen to match Visual Studio syntax highlighting, so a few of 
+      * the boundaries are little weird.  (Especially comments) known issues:
+      * 
+      * Doesn't handle DTD's
+      * mediocre handling of processing instructions <? ?> -- it won't crash, 
+      *      but the token boundaries are wrong
+      * Doesn't enforce correct XML
+      * there's probably a few cases where it will die if given in valid XML
+      * 
+      * 
+      * This tokenizer has been designed to be restartable, so you can tokenize
+      * one line of XML at a time.
+      */
+  enum XmlTokenKind
+  {
+    Open,
+    // <
+    Close,
+    //>
+    SelfClose,
+    // />
+    OpenClose,
+    // </
+    ElementName,
+    ElementWhitespace,
+    //whitespace between attributes
+    AttributeName,
+    Equals,
+    // inside attribute
+    AttributeValue,
+    // attribute value
+    CommentBegin,
+    // <!--
+    CommentText,
+    CommentEnd,
+    // -->
+    Entity,
+    // &gt;
+    OpenProcessingInstruction,
+    // <?
+    CloseProcessingInstruction,
+    // ?>
+    CDataBegin,
+    // <![CDATA[
+    CDataEnd,
+    // ]]>
+    TextContent,
+    //WhitespaceContent, // text content that's whitespace.  Space is embedded inside
+    EOF,
+    // end of file
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Extensions/UnityContainerExtensions.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Extensions/UnityContainerExtensions.cs
index 89917b56..4faffc28 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Extensions/UnityContainerExtensions.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Extensions/UnityContainerExtensions.cs
@@ -1,13 +1,31 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using Microsoft.Practices.Unity;
 
 namespace Samples.Infrastructure.Extensions
 {
-    public static class UnityContainerExtensions
+  public static class UnityContainerExtensions
+  {
+    public static void RegisterNavigationType( this IUnityContainer container, Type type )
     {
-        public static void RegisterNavigationType(this IUnityContainer container, Type type)
-        {
-            container.RegisterType(typeof(Object), type, type.FullName);
-        }
+      container.RegisterType( typeof( Object ), type, type.FullName );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ModuleBase.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ModuleBase.cs
index f01576c8..d0439b2c 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ModuleBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ModuleBase.cs
@@ -1,30 +1,55 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using Microsoft.Practices.Prism.Modularity;
-using Microsoft.Practices.Unity;
 using Microsoft.Practices.Prism.Regions;
+using Microsoft.Practices.Unity;
 
 namespace Samples.Infrastructure
 {
-    public abstract class ModuleBase : IModule
+  public abstract class ModuleBase : IModule
+  {
+    protected IRegionManager RegionManager
     {
-        protected IRegionManager RegionManager { get; private set; }
-        protected IUnityContainer Container { get; private set; }
-
-        protected ModuleBase(IUnityContainer container, IRegionManager regionManager)
-        {
-            Container = container;
-            RegionManager = regionManager;
-        }
-
-        public void Initialize()
-        {
-            //types must be registered first
-            RegisterViewsAndTypes();
-            //now initialize the module
-            InitializeModule();
-        }
-
-        protected abstract void InitializeModule();
-        protected abstract void RegisterViewsAndTypes();
+      get;
+      private set;
     }
+    protected IUnityContainer Container
+    {
+      get;
+      private set;
+    }
+
+    protected ModuleBase( IUnityContainer container, IRegionManager regionManager )
+    {
+      Container = container;
+      RegionManager = regionManager;
+    }
+
+    public void Initialize()
+    {
+      //types must be registered first
+      RegisterViewsAndTypes();
+      //now initialize the module
+      InitializeModule();
+    }
+
+    protected abstract void InitializeModule();
+    protected abstract void RegisterViewsAndTypes();
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/AssemblyInfo.cs
index 81334bfe..e9b2118d 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Properties/AssemblyInfo.cs
@@ -1,25 +1,41 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Samples.Infrastructure")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Samples.Infrastructure")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Samples.Infrastructure" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Microsoft" )]
+[assembly: AssemblyProduct( "Samples.Infrastructure" )]
+[assembly: AssemblyCopyright( "Copyright © Microsoft 2011" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -33,11 +49,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,5 +67,5 @@ 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/RegionNames.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/RegionNames.cs
index 50690b6a..a0ad1933 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/RegionNames.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/RegionNames.cs
@@ -1,10 +1,27 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Samples.Infrastructure
 {
-    public static class RegionNames
-    {
-        public static readonly string NavigationRegion = "NavigationRegion";
-        public static readonly string ContentRegion = "ContentRegion";
-    }
+  public static class RegionNames
+  {
+    public static readonly string NavigationRegion = "NavigationRegion";
+    public static readonly string ContentRegion = "ContentRegion";
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Themes/Generic.xaml
index 0fc3b157..cc1bd07e 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/Themes/Generic.xaml
@@ -1,156 +1,179 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:local="clr-namespace:Samples.Infrastructure.Controls"
     xmlns:infConverters="clr-namespace:Samples.Infrastructure.Converters">
 
-    <infConverters:XamlColorConverter x:Key="XamlColorConverter" />
-    <infConverters:CSharpColorConverter x:Key="CSharpColorConverter" />
+   <infConverters:XamlColorConverter x:Key="XamlColorConverter" />
+   <infConverters:CSharpColorConverter x:Key="CSharpColorConverter" />
 
-    <LinearGradientBrush x:Key="TabBackgroundDefault" EndPoint="0.330810546875,1" StartPoint="0.330810546875,0">
-        <GradientStop Color="#FF100311" Offset="1"/>
-        <GradientStop Color="#FF666666" Offset="0"/>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="TabBackgroundDefault" EndPoint="0.330810546875,1" StartPoint="0.330810546875,0">
+      <GradientStop Color="#FF100311" Offset="1"/>
+      <GradientStop Color="#FF666666" Offset="0"/>
+   </LinearGradientBrush>
 
-    <Style x:Key="TabItemStyle" TargetType="{x:Type TabItem}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TabItem}">
-                    <Grid Width="Auto" Height="29" Margin="0">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="0.565*"/>
-                            <RowDefinition Height="0.435*"/>
-                        </Grid.RowDefinitions>
-                        <Border Grid.RowSpan="2" CornerRadius="0" Margin="0,0,0,1" Opacity="1" SnapsToDevicePixels="True">
-                            <Border.Background>
-                                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                    <GradientStop Color="#FF333333" Offset="0"/>
-                                    <GradientStop Color="#FF9F9F9F" Offset="1"/>
-                                </LinearGradientBrush>
-                            </Border.Background>
-                        </Border>
-                        <Border Background="{StaticResource TabBackgroundDefault}" CornerRadius="0" Margin="1,0,0,1" Grid.RowSpan="2" x:Name="border" SnapsToDevicePixels="True"/>
-                        <TextBlock HorizontalAlignment="Center" Margin="15,0,15,0" VerticalAlignment="Center" Grid.RowSpan="2" FontFamily="Segoe UI" FontSize="11" FontWeight="Bold" Foreground="#4CFFFFFF" Text="{TemplateBinding Header}" TextWrapping="Wrap" x:Name="textBlock"/>
-                        <Rectangle x:Name="rectangle" Grid.RowSpan="2" Height="1" VerticalAlignment="Top" Margin="1,1,0,0" Visibility="Collapsed" SnapsToDevicePixels="True">
-                            <Rectangle.Fill>
-                                <LinearGradientBrush EndPoint="0.966,0.5" StartPoint="0.045,0.479">
-                                    <GradientStop Color="#FFF8EDED" Offset="0.504"/>
-                                    <GradientStop Color="#00111010" Offset="1"/>
-                                    <GradientStop Color="#00000000"/>
-                                </LinearGradientBrush>
-                            </Rectangle.Fill>
-                        </Rectangle>
-                        <Rectangle Grid.RowSpan="2" Width="1" HorizontalAlignment="Right" Margin="0,0,-1,1" SnapsToDevicePixels="True">
-                            <Rectangle.Fill>
-                                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                    <GradientStop Color="#FF2B2B2B" Offset="0"/>
-                                    <GradientStop Color="#99FFFFFF" Offset="1"/>
-                                </LinearGradientBrush>
-                            </Rectangle.Fill>
-                        </Rectangle>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Foreground" TargetName="textBlock" Value="#FFF2EDF4"/>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Panel.ZIndex" Value="100"/>
-                            <Setter Property="Background" TargetName="border">
-                                <Setter.Value>
-                                    <LinearGradientBrush EndPoint="-0.003,1.107" StartPoint="0,0">
-                                        <GradientStop Color="#FF9305CF" Offset="0"/>
-                                        <GradientStop Color="Black" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Setter.Value>
-                            </Setter>
-                            <Setter Property="Foreground" TargetName="textBlock" Value="#FFFFFFFF"/>
-                            <Setter Property="Visibility" TargetName="rectangle" Value="Visible"/>
-                            <Setter Property="Fill" TargetName="rectangle">
-                                <Setter.Value>
-                                    <LinearGradientBrush EndPoint="0.966,0.5" StartPoint="0.045,0.479">
-                                        <GradientStop Color="#FFF8EDED" Offset="0.504"/>
-                                        <GradientStop Color="#00BD2FD5" Offset="1"/>
-                                        <GradientStop Color="#00BD2FD5"/>
-                                    </LinearGradientBrush>
-                                </Setter.Value>
-                            </Setter>
-                            <Setter Property="Margin" TargetName="border" Value="1,0,0,0"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Margin" Value="0,0,1,0"/>
-    </Style>
+   <Style x:Key="TabItemStyle" TargetType="{x:Type TabItem}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TabItem}">
+               <Grid Width="Auto" Height="29" Margin="0">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="0.565*" />
+                     <RowDefinition Height="0.435*" />
+                  </Grid.RowDefinitions>
+                  <Border Grid.RowSpan="2" CornerRadius="0" Margin="0,0,0,1" Opacity="1" SnapsToDevicePixels="True">
+                     <Border.Background>
+                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                           <GradientStop Color="#FF333333" Offset="0" />
+                           <GradientStop Color="#FF9F9F9F" Offset="1" />
+                        </LinearGradientBrush>
+                     </Border.Background>
+                  </Border>
+                  <Border Background="{StaticResource TabBackgroundDefault}" CornerRadius="0" Margin="1,0,0,1" Grid.RowSpan="2" x:Name="border" SnapsToDevicePixels="True" />
+                  <TextBlock HorizontalAlignment="Center" Margin="15,0,15,0" VerticalAlignment="Center" Grid.RowSpan="2" FontFamily="Segoe UI" FontSize="11" FontWeight="Bold" Foreground="#4CFFFFFF" Text="{TemplateBinding Header}" TextWrapping="Wrap" x:Name="textBlock" />
+                  <Rectangle x:Name="rectangle" Grid.RowSpan="2" Height="1" VerticalAlignment="Top" Margin="1,1,0,0" Visibility="Collapsed" SnapsToDevicePixels="True">
+                     <Rectangle.Fill>
+                        <LinearGradientBrush EndPoint="0.966,0.5" StartPoint="0.045,0.479">
+                           <GradientStop Color="#FFF8EDED" Offset="0.504" />
+                           <GradientStop Color="#00111010" Offset="1" />
+                           <GradientStop Color="#00000000" />
+                        </LinearGradientBrush>
+                     </Rectangle.Fill>
+                  </Rectangle>
+                  <Rectangle Grid.RowSpan="2" Width="1" HorizontalAlignment="Right" Margin="0,0,-1,1" SnapsToDevicePixels="True">
+                     <Rectangle.Fill>
+                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                           <GradientStop Color="#FF2B2B2B" Offset="0" />
+                           <GradientStop Color="#99FFFFFF" Offset="1" />
+                        </LinearGradientBrush>
+                     </Rectangle.Fill>
+                  </Rectangle>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="Foreground" TargetName="textBlock" Value="#FFF2EDF4" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter Property="Panel.ZIndex" Value="100" />
+                     <Setter Property="Background" TargetName="border">
+                        <Setter.Value>
+                           <LinearGradientBrush EndPoint="-0.003,1.107" StartPoint="0,0">
+                              <GradientStop Color="#FF9305CF" Offset="0" />
+                              <GradientStop Color="Black" Offset="1" />
+                           </LinearGradientBrush>
+                        </Setter.Value>
+                     </Setter>
+                     <Setter Property="Foreground" TargetName="textBlock" Value="#FFFFFFFF" />
+                     <Setter Property="Visibility" TargetName="rectangle" Value="Visible" />
+                     <Setter Property="Fill" TargetName="rectangle">
+                        <Setter.Value>
+                           <LinearGradientBrush EndPoint="0.966,0.5" StartPoint="0.045,0.479">
+                              <GradientStop Color="#FFF8EDED" Offset="0.504" />
+                              <GradientStop Color="#00BD2FD5" Offset="1" />
+                              <GradientStop Color="#00BD2FD5" />
+                           </LinearGradientBrush>
+                        </Setter.Value>
+                     </Setter>
+                     <Setter Property="Margin" TargetName="border" Value="1,0,0,0" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Margin" Value="0,0,1,0" />
+   </Style>
 
-    <Style x:Key="TabControlStyle" TargetType="{x:Type TabControl}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TabControl}">
-                    <Grid KeyboardNavigation.TabNavigation="Local">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-                        <TabPanel Grid.Row="0" Margin="0,0,7,-1" x:Name="HeaderPanel" Background="Transparent" IsItemsHost="True" Panel.ZIndex="1" KeyboardNavigation.TabIndex="1" HorizontalAlignment="Right"/>
-                        <Border Grid.Row="1" x:Name="Border" Background="White" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="0" KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabNavigation="Local" KeyboardNavigation.TabIndex="2" SnapsToDevicePixels="True">
-                            <ContentPresenter Margin="4" x:Name="PART_SelectedContentHost" ContentSource="SelectedContent"/>
-                        </Border>
-                        <Rectangle HorizontalAlignment="Stretch" Margin="1,1,1,0" VerticalAlignment="Top" Width="Auto" Height="8" Grid.Row="1" SnapsToDevicePixels="True">
-                            <Rectangle.Fill>
-                                <LinearGradientBrush EndPoint="0.5,0.861" StartPoint="0.5,0">
-                                    <GradientStop Color="#FF13011B" Offset="0.014"/>
-                                    <GradientStop Color="#FF8D05C7" Offset="0.97"/>
-                                </LinearGradientBrush>
-                            </Rectangle.Fill>
-                        </Rectangle>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style x:Key="TabControlStyle" TargetType="{x:Type TabControl}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TabControl}">
+               <Grid KeyboardNavigation.TabNavigation="Local">
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto" />
+                     <RowDefinition Height="*" />
+                  </Grid.RowDefinitions>
+                  <TabPanel Grid.Row="0" Margin="0,0,7,-1" x:Name="HeaderPanel" Background="Transparent" IsItemsHost="True" Panel.ZIndex="1" KeyboardNavigation.TabIndex="1" HorizontalAlignment="Right" />
+                  <Border Grid.Row="1" x:Name="Border" Background="White" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="0" KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabNavigation="Local" KeyboardNavigation.TabIndex="2" SnapsToDevicePixels="True">
+                     <ContentPresenter Margin="4" x:Name="PART_SelectedContentHost" ContentSource="SelectedContent" />
+                  </Border>
+                  <Rectangle HorizontalAlignment="Stretch" Margin="1,1,1,0" VerticalAlignment="Top" Width="Auto" Height="8" Grid.Row="1" SnapsToDevicePixels="True">
+                     <Rectangle.Fill>
+                        <LinearGradientBrush EndPoint="0.5,0.861" StartPoint="0.5,0">
+                           <GradientStop Color="#FF13011B" Offset="0.014" />
+                           <GradientStop Color="#FF8D05C7" Offset="0.97" />
+                        </LinearGradientBrush>
+                     </Rectangle.Fill>
+                  </Rectangle>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
-    <Style TargetType="{x:Type local:DemoView}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:DemoView}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <TabControl TabStripPlacement="Top" Style="{StaticResource TabControlStyle}" >
-                                <TabItem Header="Sample" Style="{StaticResource TabItemStyle}">
-                                    <ScrollViewer VerticalScrollBarVisibility="Auto" >
-                                        <ContentPresenter Margin="10" ScrollViewer.CanContentScroll="True"  />
-                                    </ScrollViewer>
-                                </TabItem>
-                                <TabItem Header="XAML" Style="{StaticResource TabItemStyle}">
-                                    <ContentPresenter x:Name="_xamlCode" Content="{Binding XamlText, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource XamlColorConverter}}"
-                                                      HorizontalAlignment="Stretch"
-                                                      VerticalAlignment="Stretch"
-                                                      ScrollViewer.CanContentScroll="True" 
-                                                      Margin="5,10,5,5"/>
-                                </TabItem>
-                                <TabItem Header="Code" Style="{StaticResource TabItemStyle}">
-                                    <ContentPresenter x:Name="_cSharpCode" Content="{Binding CSharpText, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CSharpColorConverter}}"
-                                                      HorizontalAlignment="Stretch"
-                                                      VerticalAlignment="Stretch"
-                                                      ScrollViewer.CanContentScroll="True"
-                                                      Margin="5,10,5,5"/>
-                                </TabItem>
-                            </TabControl>
-                            <TextBlock Opacity="1" HorizontalAlignment="Left" Margin="12,5,0,0" VerticalAlignment="Top"
-                                       TextWrapping="Wrap" 
-                                       FontSize="18" 
-                                       FontFamily="Segoe UI" 
-                                       TextAlignment="right" 
-                                       Foreground="#FFFFFFFF" 
-                                       FontWeight="Bold" 
-                                       Text="{TemplateBinding Title}" />
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style TargetType="{x:Type local:DemoView}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DemoView}">
+               <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <TabControl TabStripPlacement="Top" Style="{StaticResource TabControlStyle}" >
+                        <TabItem Header="Sample" Style="{StaticResource TabItemStyle}">
+                           <ScrollViewer VerticalScrollBarVisibility="Auto">
+                              <ContentPresenter Margin="10" ScrollViewer.CanContentScroll="True" />
+                           </ScrollViewer>
+                        </TabItem>
+                        <TabItem Header="XAML" Style="{StaticResource TabItemStyle}">
+                           <ContentPresenter x:Name="_xamlCode" 
+                                             Content="{Binding XamlText, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource XamlColorConverter}}"
+                                             HorizontalAlignment="Stretch"
+                                             VerticalAlignment="Stretch"
+                                             ScrollViewer.CanContentScroll="True" 
+                                             Margin="5,10,5,5" />
+                        </TabItem>
+                        <TabItem Header="Code" Style="{StaticResource TabItemStyle}">
+                           <ContentPresenter x:Name="_cSharpCode" 
+                                             Content="{Binding CSharpText, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CSharpColorConverter}}"
+                                             HorizontalAlignment="Stretch"
+                                             VerticalAlignment="Stretch"
+                                             ScrollViewer.CanContentScroll="True"
+                                             Margin="5,10,5,5" />
+                        </TabItem>
+                     </TabControl>
+                     <TextBlock Opacity="1" 
+                                HorizontalAlignment="Left" 
+                                Margin="12,5,0,0" 
+                                VerticalAlignment="Top"
+                                TextWrapping="Wrap" 
+                                FontSize="18" 
+                                FontFamily="Segoe UI" 
+                                TextAlignment="right" 
+                                Foreground="#FFFFFFFF" 
+                                FontWeight="Bold" 
+                                Text="{TemplateBinding Title}" />
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ViewModelBase.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ViewModelBase.cs
index b663320b..f05a8389 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ViewModelBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples.Infrastructure/ViewModelBase.cs
@@ -1,17 +1,36 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.ComponentModel;
 
 namespace Samples.Infrastructure
 {
-    public interface IViewModel { }
+  public interface IViewModel
+  {
+  }
 
-    public class ViewModelBase : IViewModel, INotifyPropertyChanged
+  public class ViewModelBase : IViewModel, INotifyPropertyChanged
+  {
+    public event PropertyChangedEventHandler PropertyChanged;
+    protected virtual void OnPropertyChanged( string propertyName )
     {
-        public event PropertyChangedEventHandler PropertyChanged;
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            if (PropertyChanged != null)
-                PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
-        }
+      if( PropertyChanged != null )
+        PropertyChanged( this, new PropertyChangedEventArgs( propertyName ) );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml
index 99b2dad0..b1529050 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml
@@ -1,14 +1,32 @@
-<Application x:Class="Samples.App"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<Application x:Class="Samples.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <Application.Resources>
-        
-        <ResourceDictionary>
-            <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="/Resources/TextBlockStyles.xaml"   />
-                <ResourceDictionary Source="/Resources/TreeViewStyles.xaml"   />
-            </ResourceDictionary.MergedDictionaries>
-        </ResourceDictionary>
-
-    </Application.Resources>
+   <Application.Resources>
+
+      <ResourceDictionary>
+         <ResourceDictionary.MergedDictionaries>
+            <ResourceDictionary Source="/Resources/TextBlockStyles.xaml" />
+            <ResourceDictionary Source="/Resources/TreeViewStyles.xaml" />
+         </ResourceDictionary.MergedDictionaries>
+      </ResourceDictionary>
+
+   </Application.Resources>
 </Application>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml.cs
index d59478b5..2d79c8c5 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/App.xaml.cs
@@ -1,30 +1,41 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
-using System.Globalization;
-using System.Threading;
 
 namespace Samples
 {
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
+  /// <summary>
+  /// Interaction logic for App.xaml
+  /// </summary>
+  public partial class App : Application
+  {
+    protected override void OnStartup( StartupEventArgs e )
     {
-        protected override void OnStartup(StartupEventArgs e)
-        {
-            // Put the following code before InitializeComponent()
-            // Sets the culture to French (France)
-            //Thread.CurrentThread.CurrentCulture = new CultureInfo("da-DK");
-            // Sets the UI culture to French (France)
-            //Thread.CurrentThread.CurrentUICulture = new CultureInfo("da-DK");
-
-            base.OnStartup(e);
-            Bootstrapper bootstrapper = new Bootstrapper();
-            bootstrapper.Run();
-        }
+      // Put the following code before InitializeComponent()
+      // Sets the culture to French (France)
+      //Thread.CurrentThread.CurrentCulture = new CultureInfo("da-DK");
+      // Sets the UI culture to French (France)
+      //Thread.CurrentThread.CurrentUICulture = new CultureInfo("da-DK");
+
+      base.OnStartup( e );
+      Bootstrapper bootstrapper = new Bootstrapper();
+      bootstrapper.Run();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Bootstrapper.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Bootstrapper.cs
index 9323254e..cdb78adc 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Bootstrapper.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Bootstrapper.cs
@@ -1,30 +1,47 @@
-using System;
-using Microsoft.Practices.Prism.UnityExtensions;
-using Microsoft.Practices.Unity;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 using Microsoft.Practices.Prism.Modularity;
+using Microsoft.Practices.Prism.UnityExtensions;
+using Microsoft.Practices.Unity;
 
 namespace Samples
 {
-    public class Bootstrapper : UnityBootstrapper
+  public class Bootstrapper : UnityBootstrapper
+  {
+    protected override DependencyObject CreateShell()
+    {
+      Container.RegisterType<IShellViewModel, ShellViewModel>();
+      return Container.Resolve<Shell>();
+    }
+
+    protected override void InitializeShell()
+    {
+      base.InitializeShell();
+
+      App.Current.MainWindow = ( Shell )Shell;
+      App.Current.MainWindow.Show();
+    }
+
+    protected override Microsoft.Practices.Prism.Modularity.IModuleCatalog CreateModuleCatalog()
     {
-        protected override DependencyObject CreateShell()
-        {
-            Container.RegisterType<IShellViewModel, ShellViewModel>();
-            return Container.Resolve<Shell>();
-        }
-
-        protected override void InitializeShell()
-        {
-            base.InitializeShell();
-
-            App.Current.MainWindow = (Shell)Shell;
-            App.Current.MainWindow.Show();
-        }
-
-        protected override Microsoft.Practices.Prism.Modularity.IModuleCatalog CreateModuleCatalog()
-        {
-            return new ConfigurationModuleCatalog();
-        }
+      return new ConfigurationModuleCatalog();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/IShellViewModel.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples/IShellViewModel.cs
index b9250d81..d73c3052 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/IShellViewModel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/IShellViewModel.cs
@@ -1,8 +1,25 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Samples
 {
-    public interface IShellViewModel
-    {
-    }
+  public interface IShellViewModel
+  {
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/AssemblyInfo.cs
index d59369ca..1abb89fb 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Properties/AssemblyInfo.cs
@@ -1,25 +1,41 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Samples")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("Samples")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Samples" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Microsoft" )]
+[assembly: AssemblyProduct( "Samples" )]
+[assembly: AssemblyCopyright( "Copyright © Microsoft 2011" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -33,11 +49,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,5 +67,5 @@ 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml
index b5b8bd85..47038bc9 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TextBlockStyles.xaml
@@ -1,11 +1,29 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <Style x:Key="Header" TargetType="TextBlock">
-        <Setter Property="FontSize" Value="18" />
-        <Setter Property="FontWeight" Value="Bold" />
-        <Setter Property="Foreground" Value="#FF8605BD" />
-        <Setter Property="Margin" Value="0,5" />
-    </Style>
+   <Style x:Key="Header" TargetType="TextBlock">
+      <Setter Property="FontSize" Value="18" />
+      <Setter Property="FontWeight" Value="Bold" />
+      <Setter Property="Foreground" Value="#FF8605BD" />
+      <Setter Property="Margin" Value="0,5" />
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml
index 40015624..3cfed9a6 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Resources/TreeViewStyles.xaml
@@ -1,231 +1,249 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    
-    <SolidColorBrush x:Key="HighlightFill" Color="#59FFFFFF"/>
-    <LinearGradientBrush x:Key="SelectedFill" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#59FFFFFF" Offset="0"/>
-        <GradientStop Color="#33FFFFFF" Offset="1"/>
-        <GradientStop Color="#19FFFFFF" Offset="0.5"/>
-    </LinearGradientBrush>
-    <SolidColorBrush x:Key="ForegroundHighlightFill" Color="#FFFFFFFF"/>
-    <SolidColorBrush x:Key="ForegroundFill" Color="#FFFFFFFF"/>
-    <LinearGradientBrush x:Key="GlyphFill" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FFFFFFFF" Offset="0"/>
-        <GradientStop Color="#FF959595" Offset="1"/>
-    </LinearGradientBrush>
-    <SolidColorBrush x:Key="ControlFill" Color="#00FFFFFF"/>
-    <SolidColorBrush x:Key="CommonFill" Color="#00FFFFFF"/>
 
-    <Style x:Key="TreeViewItemToggleButton" TargetType="{x:Type ToggleButton}">
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="ExpandIndicatorIsChecked">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="90"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-                                <SplineThicknessKeyFrame KeyTime="00:00:00.2000000" Value="0,1,0,0"/>
-                            </ThicknessAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="ExpandIndicatorIsCheckedFalse">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00" Value="90"/>
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(FrameworkElement.Margin)">
-                                <SplineThicknessKeyFrame KeyTime="00:00:00" Value="1,0,0,0"/>
-                                <SplineThicknessKeyFrame KeyTime="00:00:00.2000000" Value="2,0,0,0"/>
-                            </ThicknessAnimationUsingKeyFrames>
-                            <BooleanAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="grid" Storyboard.TargetProperty="(UIElement.SnapsToDevicePixels)">
-                                <DiscreteBooleanKeyFrame KeyTime="00:00:00.2000000" Value="True"/>
-                            </BooleanAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <Grid Width="15" Height="13" Background="Transparent" x:Name="grid">
-                        <Ellipse Width="12" Height="12" Fill="{TemplateBinding Background}" Stroke="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
-                        <Path HorizontalAlignment="Center" VerticalAlignment="Center" Height="6" Width="6" Stretch="Fill" Opacity="1" 
-                              Data="M303,349 C303,349 303,345 303,345 303,345 309.04167,347 309.04167,347 309.04167,347 303,349 303,349 z" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" x:Name="path" RenderTransformOrigin="0.5,0.5">
-                            <Path.RenderTransform>
-                                <TransformGroup>
-                                    <ScaleTransform ScaleX="1" ScaleY="1"/>
-                                    <SkewTransform AngleX="0" AngleY="0"/>
-                                    <RotateTransform Angle="0"/>
-                                    <TranslateTransform X="0" Y="0"/>
-                                </TransformGroup>
-                            </Path.RenderTransform>
-                        </Path>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsChecked" Value="True">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard x:Name="ExpandIndicatorIsCheckedFalse_BeginStoryboard1" Storyboard="{StaticResource ExpandIndicatorIsCheckedFalse}"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ExpandIndicatorIsChecked}" x:Name="ExpandIndicatorIsChecked_BeginStoryboard"/>
-                            </Trigger.EnterActions>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Foreground" Value="{StaticResource GlyphFill}"/>
-        <Setter Property="Background" Value="{StaticResource ControlFill}"/>
-    </Style>
+   <SolidColorBrush x:Key="HighlightFill" Color="#59FFFFFF" />
+   <LinearGradientBrush x:Key="SelectedFill" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#59FFFFFF" Offset="0" />
+      <GradientStop Color="#33FFFFFF" Offset="1" />
+      <GradientStop Color="#19FFFFFF" Offset="0.5" />
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ForegroundHighlightFill" Color="#FFFFFFFF" />
+   <SolidColorBrush x:Key="ForegroundFill" Color="#FFFFFFFF" />
+   <LinearGradientBrush x:Key="GlyphFill" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFFFFFFF" Offset="0" />
+      <GradientStop Color="#FF959595" Offset="1" />
+   </LinearGradientBrush>
+   <SolidColorBrush x:Key="ControlFill" Color="#00FFFFFF" />
+   <SolidColorBrush x:Key="CommonFill" Color="#00FFFFFF" />
+
+   <Style x:Key="TreeViewItemToggleButton" TargetType="{x:Type ToggleButton}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <ControlTemplate.Resources>
+                  <Storyboard x:Key="ExpandIndicatorIsChecked">
+                     <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)">
+                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="90" />
+                     </DoubleAnimationUsingKeyFrames>
+                     <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                        <SplineThicknessKeyFrame KeyTime="00:00:00.2000000" Value="0,1,0,0" />
+                     </ThicknessAnimationUsingKeyFrames>
+                  </Storyboard>
+                  <Storyboard x:Key="ExpandIndicatorIsCheckedFalse">
+                     <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[2].(RotateTransform.Angle)">
+                        <SplineDoubleKeyFrame KeyTime="00:00:00" Value="90" />
+                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0" />
+                     </DoubleAnimationUsingKeyFrames>
+                     <ThicknessAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="path" Storyboard.TargetProperty="(FrameworkElement.Margin)">
+                        <SplineThicknessKeyFrame KeyTime="00:00:00" Value="1,0,0,0" />
+                        <SplineThicknessKeyFrame KeyTime="00:00:00.2000000" Value="2,0,0,0" />
+                     </ThicknessAnimationUsingKeyFrames>
+                     <BooleanAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="grid" Storyboard.TargetProperty="(UIElement.SnapsToDevicePixels)">
+                        <DiscreteBooleanKeyFrame KeyTime="00:00:00.2000000" Value="True" />
+                     </BooleanAnimationUsingKeyFrames>
+                  </Storyboard>
+               </ControlTemplate.Resources>
+               <Grid Width="15" Height="13" Background="Transparent" x:Name="grid">
+                  <Ellipse Width="12" Height="12" Fill="{TemplateBinding Background}" Stroke="{x:Null}" HorizontalAlignment="Center" VerticalAlignment="Center" />
+                  <Path HorizontalAlignment="Center" VerticalAlignment="Center" Height="6" Width="6" Stretch="Fill" Opacity="1" 
+                        Data="M303,349 C303,349 303,345 303,345 303,345 309.04167,347 309.04167,347 309.04167,347 303,349 303,349 z" Fill="{TemplateBinding Foreground}" Margin="2,0,0,0" x:Name="path" RenderTransformOrigin="0.5,0.5">
+                     <Path.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform ScaleX="1" ScaleY="1" />
+                           <SkewTransform AngleX="0" AngleY="0" />
+                           <RotateTransform Angle="0" />
+                           <TranslateTransform X="0" Y="0" />
+                        </TransformGroup>
+                     </Path.RenderTransform>
+                  </Path>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="True">
+                     <Trigger.ExitActions>
+                        <BeginStoryboard x:Name="ExpandIndicatorIsCheckedFalse_BeginStoryboard1" Storyboard="{StaticResource ExpandIndicatorIsCheckedFalse}" />
+                     </Trigger.ExitActions>
+                     <Trigger.EnterActions>
+                        <BeginStoryboard Storyboard="{StaticResource ExpandIndicatorIsChecked}" x:Name="ExpandIndicatorIsChecked_BeginStoryboard" />
+                     </Trigger.EnterActions>
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Foreground" Value="{StaticResource GlyphFill}" />
+      <Setter Property="Background" Value="{StaticResource ControlFill}" />
+   </Style>
 
-    <Style TargetType="{x:Type TreeViewItem}">
-        <Setter Property="Background" Value="{StaticResource CommonFill}"/>
-        <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-        <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}"/>
-        <Setter Property="Padding" Value="1,0,0,0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type TreeViewItem}">
-                    <ControlTemplate.Resources>
-                        <Storyboard x:Key="TreeItemIsExpanded">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="(UIElement.Opacity)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="1"/>
-                            </DoubleAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="MouseOver">
-                            <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                                <SplineColorKeyFrame KeyTime="00:00:00" Value="#4CFFFFFF"/>
-                            </ColorAnimationUsingKeyFrames>
-                            <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                <SplineColorKeyFrame KeyTime="00:00:00" Value="#4CFFFFFF"/>
-                            </ColorAnimationUsingKeyFrames>
-                            <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                <SplineColorKeyFrame KeyTime="00:00:00" Value="#4CFFFFFF"/>
-                            </ColorAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="MouseOut">
-                            <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                                <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF"/>
-                            </ColorAnimationUsingKeyFrames>
-                            <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF"/>
-                            </ColorAnimationUsingKeyFrames>
-                            <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF"/>
-                            </ColorAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="ItemSelected">
-                            <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Offset)">
-                                <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0.5"/>
-                            </DoubleAnimationUsingKeyFrames>
-                            <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                                <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#59FFFFFF"/>
-                            </ColorAnimationUsingKeyFrames>
-                            <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#0CFFFFFF"/>
-                            </ColorAnimationUsingKeyFrames>
-                            <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#33FFFFFF"/>
-                            </ColorAnimationUsingKeyFrames>
-                        </Storyboard>
-                        <Storyboard x:Key="ItemDeselected">
-                            <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
-                                <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF"/>
-                            </ColorAnimationUsingKeyFrames>
-                            <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
-                                <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF"/>
-                            </ColorAnimationUsingKeyFrames>
-                            <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
-                                <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF"/>
-                            </ColorAnimationUsingKeyFrames>
-                        </Storyboard>
-                    </ControlTemplate.Resources>
-                    <DockPanel SnapsToDevicePixels="True">
-                        <Grid x:Name="HeaderContainer" Background="Transparent" DockPanel.Dock="Top">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <Border Grid.Column="0" x:Name="Selection_Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" Grid.ColumnSpan="2" Grid.Row="0" Grid.RowSpan="1" Opacity="1">
-                                <Border.Background>
-                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                        <GradientStop Color="#00FFFFFF" Offset="0"/>
-                                        <GradientStop Color="#00FFFFFF" Offset="1"/>
-                                        <GradientStop Color="#00FFFFFF" Offset="0.5"/>
-                                    </LinearGradientBrush>
-                                </Border.Background>
-                            </Border>
-                            <Rectangle Stroke="{x:Null}" HorizontalAlignment="Stretch" Width="Auto" Grid.Column="0" Grid.RowSpan="1" Grid.ColumnSpan="2" x:Name="SelectedRect">
-                                <Rectangle.Fill>
-                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                        <GradientStop Color="#00FFFFFF" Offset="0"/>
-                                        <GradientStop Color="#00FFFFFF" Offset="1"/>
-                                        <GradientStop Color="#00FFFFFF" Offset="0.533"/>
-                                    </LinearGradientBrush>
-                                </Rectangle.Fill>
-                            </Rectangle>
-                            <ContentPresenter x:Name="PART_Header" ContentSource="Header" Width="Auto" VerticalAlignment="Center" Grid.ColumnSpan="1" Grid.Column="1" Margin="3,0,0,0"/>
-                            <ToggleButton x:Name="Expander"  Style="{StaticResource TreeViewItemToggleButton}" IsChecked="{Binding Path=IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" ClickMode="Press" VerticalAlignment="Center" Margin="0,3,0,3"/>
-                        </Grid>
-                        <ItemsPresenter x:Name="ItemsHost" HorizontalAlignment="Stretch" Height="Auto" Opacity="0" Margin="14,1,0,0"/>
-                    </DockPanel>
-                    <ControlTemplate.Triggers>
+   <Style TargetType="{x:Type TreeViewItem}">
+      <Setter Property="Background" Value="{StaticResource CommonFill}" />
+      <Setter Property="HorizontalContentAlignment" Value="{Binding Path=HorizontalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+      <Setter Property="VerticalContentAlignment" Value="{Binding Path=VerticalContentAlignment, RelativeSource={RelativeSource AncestorType={x:Type ItemsControl}}}" />
+      <Setter Property="Padding" Value="1,0,0,0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type TreeViewItem}">
+               <ControlTemplate.Resources>
+                  <Storyboard x:Key="TreeItemIsExpanded">
+                     <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="ItemsHost" Storyboard.TargetProperty="(UIElement.Opacity)">
+                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="1" />
+                     </DoubleAnimationUsingKeyFrames>
+                  </Storyboard>
+                  <Storyboard x:Key="MouseOver">
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00" Value="#4CFFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00" Value="#4CFFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00" Value="#4CFFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                  </Storyboard>
+                  <Storyboard x:Key="MouseOut">
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="Selection_Border" Storyboard.TargetProperty="(Panel.Background).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                  </Storyboard>
+                  <Storyboard x:Key="ItemSelected">
+                     <DoubleAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Offset)">
+                        <SplineDoubleKeyFrame KeyTime="00:00:00.2000000" Value="0.5" />
+                     </DoubleAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#59FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#0CFFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#33FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                  </Storyboard>
+                  <Storyboard x:Key="ItemDeselected">
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[0].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[2].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                     <ColorAnimationUsingKeyFrames BeginTime="00:00:00" Storyboard.TargetName="SelectedRect" Storyboard.TargetProperty="(Shape.Fill).(GradientBrush.GradientStops)[1].(GradientStop.Color)">
+                        <SplineColorKeyFrame KeyTime="00:00:00.2000000" Value="#00FFFFFF" />
+                     </ColorAnimationUsingKeyFrames>
+                  </Storyboard>
+               </ControlTemplate.Resources>
+               <DockPanel SnapsToDevicePixels="True">
+                  <Grid x:Name="HeaderContainer" Background="Transparent" DockPanel.Dock="Top">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                     </Grid.ColumnDefinitions>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+                     <Border Grid.Column="0" x:Name="Selection_Border" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" Grid.ColumnSpan="2" Grid.Row="0" Grid.RowSpan="1" Opacity="1">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                              <GradientStop Color="#00FFFFFF" Offset="0" />
+                              <GradientStop Color="#00FFFFFF" Offset="1" />
+                              <GradientStop Color="#00FFFFFF" Offset="0.5" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                     </Border>
+                     <Rectangle Stroke="{x:Null}" HorizontalAlignment="Stretch" Width="Auto" Grid.Column="0" Grid.RowSpan="1" Grid.ColumnSpan="2" x:Name="SelectedRect">
+                        <Rectangle.Fill>
+                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                              <GradientStop Color="#00FFFFFF" Offset="0" />
+                              <GradientStop Color="#00FFFFFF" Offset="1 "/>
+                              <GradientStop Color="#00FFFFFF" Offset="0.533" />
+                           </LinearGradientBrush>
+                        </Rectangle.Fill>
+                     </Rectangle>
+                     <ContentPresenter x:Name="PART_Header" ContentSource="Header" Width="Auto" VerticalAlignment="Center" Grid.ColumnSpan="1" Grid.Column="1" Margin="3,0,0,0" />
+                     <ToggleButton x:Name="Expander"  Style="{StaticResource TreeViewItemToggleButton}" IsChecked="{Binding Path=IsExpanded, RelativeSource={RelativeSource TemplatedParent}}" ClickMode="Press" VerticalAlignment="Center" Margin="0,3,0,3" />
+                  </Grid>
+                  <ItemsPresenter x:Name="ItemsHost" HorizontalAlignment="Stretch" Height="Auto" Opacity="0" Margin="14,1,0,0" />
+               </DockPanel>
+               <ControlTemplate.Triggers>
 
-                        <DataTrigger Binding="{Binding Path=Parent.Parent, RelativeSource={RelativeSource TemplatedParent}}" Value="{x:Null}">
-                            <Setter TargetName="ItemsHost" Property="Margin" Value="15,1,0,0" />
-                        </DataTrigger>
+                  <DataTrigger Binding="{Binding Path=Parent.Parent, RelativeSource={RelativeSource TemplatedParent}}" Value="{x:Null}">
+                     <Setter TargetName="ItemsHost" Property="Margin" Value="15,1,0,0" />
+                  </DataTrigger>
 
-                        <Trigger SourceName="HeaderContainer" Property="IsMouseOver" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource MouseOver}" x:Name="MouseOver_BeginStoryboard_HitTestArea"/>
-                            </Trigger.EnterActions>
-                            <Trigger.ExitActions>
-                                <BeginStoryboard Storyboard="{StaticResource MouseOut}" x:Name="MouseOut_BeginStoryboard_HitTestArea"/>
-                            </Trigger.ExitActions>
-                        </Trigger>
+                  <Trigger SourceName="HeaderContainer" Property="IsMouseOver" Value="True">
+                     <Trigger.EnterActions>
+                        <BeginStoryboard Storyboard="{StaticResource MouseOver}" x:Name="MouseOver_BeginStoryboard_HitTestArea" />
+                     </Trigger.EnterActions>
+                     <Trigger.ExitActions>
+                        <BeginStoryboard Storyboard="{StaticResource MouseOut}" x:Name="MouseOut_BeginStoryboard_HitTestArea" />
+                     </Trigger.ExitActions>
+                  </Trigger>
 
 
-                        <Trigger Property="IsExpanded" Value="false">
-                            <Setter Property="Visibility" Value="Collapsed" TargetName="ItemsHost"/>
-                        </Trigger>
-                        <Trigger Property="IsExpanded" Value="True">
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource TreeItemIsExpanded}" x:Name="TreeItemIsExpanded_BeginStoryboard"/>
-                            </Trigger.EnterActions>
-                            <Trigger.ExitActions>
-                                <StopStoryboard BeginStoryboardName="TreeItemIsExpanded_BeginStoryboard"/>
-                            </Trigger.ExitActions>
-                            <Setter Property="Margin" Value="0,0,0,0"/>
-                            <Setter Property="Grid.RowSpan" TargetName="Selection_Border" Value="1"/>
-                        </Trigger>
-                        <Trigger Property="HasItems" Value="false">
-                            <Setter Property="Visibility" Value="Hidden" TargetName="Expander"/>
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="true">
-                            <Trigger.ExitActions>
-                                <BeginStoryboard x:Name="ItemDeselected_BeginStoryboard1" Storyboard="{StaticResource ItemDeselected}"/>
-                            </Trigger.ExitActions>
-                            <Trigger.EnterActions>
-                                <BeginStoryboard Storyboard="{StaticResource ItemSelected}" x:Name="ItemSelected_BeginStoryboard"/>
-                            </Trigger.EnterActions>
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsSelected" Value="true"/>
-                                <Condition Property="IsSelectionActive" Value="false"/>
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Background" Value="{StaticResource SelectedFill}"/>
-                            <Setter Property="Foreground" Value="{StaticResource ForegroundHighlightFill}"/>
-                        </MultiTrigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Margin" Value="0,0,0,1"/>
-        <Setter Property="Foreground" Value="{StaticResource ForegroundFill}"/>
-    </Style>
+                  <Trigger Property="IsExpanded" Value="false">
+                     <Setter Property="Visibility" Value="Collapsed" TargetName="ItemsHost" />
+                  </Trigger>
+                  <Trigger Property="IsExpanded" Value="True">
+                     <Trigger.EnterActions>
+                        <BeginStoryboard Storyboard="{StaticResource TreeItemIsExpanded}" x:Name="TreeItemIsExpanded_BeginStoryboard" />
+                     </Trigger.EnterActions>
+                     <Trigger.ExitActions>
+                        <StopStoryboard BeginStoryboardName="TreeItemIsExpanded_BeginStoryboard" />
+                     </Trigger.ExitActions>
+                     <Setter Property="Margin" Value="0,0,0,0" />
+                     <Setter Property="Grid.RowSpan" TargetName="Selection_Border" Value="1" />
+                  </Trigger>
+                  <Trigger Property="HasItems" Value="false">
+                     <Setter Property="Visibility" Value="Hidden" TargetName="Expander" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="true">
+                     <Trigger.ExitActions>
+                        <BeginStoryboard x:Name="ItemDeselected_BeginStoryboard1" Storyboard="{StaticResource ItemDeselected}" />
+                     </Trigger.ExitActions>
+                     <Trigger.EnterActions>
+                        <BeginStoryboard Storyboard="{StaticResource ItemSelected}" x:Name="ItemSelected_BeginStoryboard" />
+                     </Trigger.EnterActions>
+                  </Trigger>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsSelected" Value="true" />
+                        <Condition Property="IsSelectionActive" Value="false" />
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" Value="{StaticResource SelectedFill}" />
+                     <Setter Property="Foreground" Value="{StaticResource ForegroundHighlightFill}" />
+                  </MultiTrigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Margin" Value="0,0,0,1" />
+      <Setter Property="Foreground" Value="{StaticResource ForegroundFill}" />
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml
index 413091d1..5c688663 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml
@@ -1,47 +1,65 @@
-<Window x:Class="Samples.Shell" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<Window x:Class="Samples.Shell" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:inf="clr-namespace:Samples.Infrastructure;assembly=Samples.Infrastructure"
         xmlns:infCommands="clr-namespace:Samples.Infrastructure.Commands;assembly=Samples.Infrastructure"
         xmlns:prism="http://www.codeplex.com/CompositeWPF"
         Background="Black"
         Title="Extended WPF Toolkit - Samples" Height="768" Width="1024" >
-    <Grid>
-        <Image Source="/Images/Background.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left" Grid.RowSpan="2" />
-        <Grid Margin="15" >
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"  />
-                <RowDefinition />
-            </Grid.RowDefinitions>
-
-            <Grid Margin="10,0,10,10">
-                <TextBlock Text="Extended WPF Toolkit" Foreground="WHite" FontSize="28" FontWeight="Bold"   />
-            </Grid>
-
-            <Grid Grid.Row="1">
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="Auto" />
-                    <ColumnDefinition Width="*" />
-                </Grid.ColumnDefinitions>
-
-                <Border CornerRadius="5" BorderBrush="#FF666666" BorderThickness="1" >
-                    <TreeView prism:RegionManager.RegionName="{x:Static inf:RegionNames.NavigationRegion}" 
+   <Grid>
+      <Image Source="/Images/Background.png" Stretch="None" VerticalAlignment="Top" HorizontalAlignment="Left" Grid.RowSpan="2" />
+      <Grid Margin="15" >
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+         </Grid.RowDefinitions>
+
+         <Grid Margin="10,0,10,10">
+            <TextBlock Text="Extended WPF Toolkit" Foreground="WHite" FontSize="28" FontWeight="Bold" />
+         </Grid>
+
+         <Grid Grid.Row="1">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="Auto" />
+               <ColumnDefinition Width="*" />
+            </Grid.ColumnDefinitions>
+
+            <Border CornerRadius="5" BorderBrush="#FF666666" BorderThickness="1">
+               <TreeView prism:RegionManager.RegionName="{x:Static inf:RegionNames.NavigationRegion}" 
                               infCommands:TreeViewSelected.Command="{Binding NavigateCommand}" 
                               BorderBrush="{x:Null}" MinWidth="225" Margin="3"
                               Loaded="TreeView_Loaded">
-                        <TreeView.Background>
-                            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                <GradientStop Color="#A1000000" Offset="0" />
-                                <GradientStop Color="Black" Offset="1" />
-                            </LinearGradientBrush>
-                        </TreeView.Background>
-                    </TreeView>
-                </Border>
-
-                <Border Grid.Column="1" Margin="10,0,10,0" BorderBrush="Gray" BorderThickness="1" Background="#2C2E3E" CornerRadius="3">
-                    <ContentControl x:Name="MainContent" prism:RegionManager.RegionName="{x:Static inf:RegionNames.ContentRegion}" Margin="5,0,5,8" />
-                </Border>
-
-            </Grid>
-        </Grid>
-    </Grid>
+                  <TreeView.Background>
+                     <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                        <GradientStop Color="#A1000000" Offset="0" />
+                        <GradientStop Color="Black" Offset="1" />
+                     </LinearGradientBrush>
+                  </TreeView.Background>
+               </TreeView>
+            </Border>
+
+            <Border Grid.Column="1" Margin="10,0,10,0" BorderBrush="Gray" BorderThickness="1" Background="#2C2E3E" CornerRadius="3">
+               <ContentControl x:Name="MainContent" prism:RegionManager.RegionName="{x:Static inf:RegionNames.ContentRegion}" Margin="5,0,5,8" />
+            </Border>
+
+         </Grid>
+      </Grid>
+   </Grid>
 </Window>
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml.cs
index a4af829b..91d0b30e 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/Shell.xaml.cs
@@ -1,28 +1,51 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
-using System.ComponentModel;
 
 namespace Samples
 {
-    public partial class Shell : Window
+  public partial class Shell : Window
+  {
+    public Shell( IShellViewModel viewModel )
+    {
+      InitializeComponent();
+      ViewModel = viewModel;
+    }
+
+    public IShellViewModel ViewModel
+    {
+      get
+      {
+        return ( IShellViewModel )DataContext;
+      }
+      private set
+      {
+        DataContext = value;
+      }
+    }
+
+    private void TreeView_Loaded( object sender, RoutedEventArgs e )
     {
-        public Shell(IShellViewModel viewModel)
-        {
-            InitializeComponent();
-            ViewModel = viewModel;
-        }
-
-        public IShellViewModel ViewModel
-        {
-            get { return (IShellViewModel)DataContext; }
-            private set { DataContext = value; }
-        }
-
-        private void TreeView_Loaded(object sender, RoutedEventArgs e)
-        {
-            TreeView tv = (TreeView)sender;
-            tv.Items.SortDescriptions.Add(new SortDescription("Header", ListSortDirection.Ascending));
-        }
+      TreeView tv = ( TreeView )sender;
+      tv.Items.SortDescriptions.Add( new SortDescription( "Header", ListSortDirection.Ascending ) );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/Samples/Samples/ShellViewModel.cs b/ExtendedWPFToolkitSolution/Src/Samples/Samples/ShellViewModel.cs
index 8f91e527..d499c960 100644
--- a/ExtendedWPFToolkitSolution/Src/Samples/Samples/ShellViewModel.cs
+++ b/ExtendedWPFToolkitSolution/Src/Samples/Samples/ShellViewModel.cs
@@ -1,3 +1,21 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System;
 using System.Windows.Input;
 using Microsoft.Practices.Prism.Commands;
@@ -6,22 +24,26 @@ using Samples.Infrastructure;
 
 namespace Samples
 {
-    public class ShellViewModel : ViewModelBase, IShellViewModel
-    {
-        private readonly IRegionManager _regionManager;
+  public class ShellViewModel : ViewModelBase, IShellViewModel
+  {
+    private readonly IRegionManager _regionManager;
 
-        public ICommand NavigateCommand { get; set; }     
+    public ICommand NavigateCommand
+    {
+      get;
+      set;
+    }
 
-        public ShellViewModel(IRegionManager regionManager)
-        {
-            _regionManager = regionManager;
-            NavigateCommand = new DelegateCommand<string>(Navigate);
-        }
+    public ShellViewModel( IRegionManager regionManager )
+    {
+      _regionManager = regionManager;
+      NavigateCommand = new DelegateCommand<string>( Navigate );
+    }
 
-        private void Navigate(string navigatePath)
-        {
-            if (!String.IsNullOrWhiteSpace(navigatePath))
-                _regionManager.RequestNavigate(RegionNames.ContentRegion, navigatePath);
-        }
+    private void Navigate( string navigatePath )
+    {
+      if( !String.IsNullOrWhiteSpace( navigatePath ) )
+        _regionManager.RequestNavigate( RegionNames.ContentRegion, navigatePath );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs
index 6a73cd8f..93f09959 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/BusyIndicator.cs
@@ -1,4 +1,22 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Shapes;
@@ -6,261 +24,301 @@ using System.Windows.Threading;
 
 namespace Microsoft.Windows.Controls
 {
+  /// <summary>
+  /// A control to provide a visual indicator when an application is busy.
+  /// </summary>
+  [TemplateVisualState( Name = VisualStates.StateIdle, GroupName = VisualStates.GroupBusyStatus )]
+  [TemplateVisualState( Name = VisualStates.StateBusy, GroupName = VisualStates.GroupBusyStatus )]
+  [TemplateVisualState( Name = VisualStates.StateVisible, GroupName = VisualStates.GroupVisibility )]
+  [TemplateVisualState( Name = VisualStates.StateHidden, GroupName = VisualStates.GroupVisibility )]
+  [StyleTypedProperty( Property = "OverlayStyle", StyleTargetType = typeof( Rectangle ) )]
+  [StyleTypedProperty( Property = "ProgressBarStyle", StyleTargetType = typeof( ProgressBar ) )]
+  public class BusyIndicator : ContentControl
+  {
+    #region Private Members
+
     /// <summary>
-    /// A control to provide a visual indicator when an application is busy.
+    /// Timer used to delay the initial display and avoid flickering.
     /// </summary>
-    [TemplateVisualState(Name = VisualStates.StateIdle, GroupName = VisualStates.GroupBusyStatus)]
-    [TemplateVisualState(Name = VisualStates.StateBusy, GroupName = VisualStates.GroupBusyStatus)]
-    [TemplateVisualState(Name = VisualStates.StateVisible, GroupName = VisualStates.GroupVisibility)]
-    [TemplateVisualState(Name = VisualStates.StateHidden, GroupName = VisualStates.GroupVisibility)]
-    [StyleTypedProperty(Property = "OverlayStyle", StyleTargetType = typeof(Rectangle))]
-    [StyleTypedProperty(Property = "ProgressBarStyle", StyleTargetType = typeof(ProgressBar))]
-    public class BusyIndicator : ContentControl
-    {
-        #region Private Members
+    private DispatcherTimer _displayAfterTimer = new DispatcherTimer();
 
-        /// <summary>
-        /// Timer used to delay the initial display and avoid flickering.
-        /// </summary>
-        private DispatcherTimer _displayAfterTimer = new DispatcherTimer();
+    #endregion //Private Members
 
-        #endregion //Private Members
+    #region Constructors
 
-        #region Constructors
+    static BusyIndicator()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( BusyIndicator ), new FrameworkPropertyMetadata( typeof( BusyIndicator ) ) );
+    }
 
-        static BusyIndicator()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(BusyIndicator), new FrameworkPropertyMetadata(typeof(BusyIndicator)));
-        }
+    public BusyIndicator()
+    {
+      _displayAfterTimer.Tick += DisplayAfterTimerElapsed;
+    }
 
-        public BusyIndicator()
-        {
-            _displayAfterTimer.Tick += DisplayAfterTimerElapsed;
-        }
+    #endregion //Constructors
 
-        #endregion //Constructors
+    #region Base Class Overrides
 
-        #region Base Class Overrides
+    /// <summary>
+    /// Overrides the OnApplyTemplate method.
+    /// </summary>
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+      ChangeVisualState( false );
+    }
 
-        /// <summary>
-        /// Overrides the OnApplyTemplate method.
-        /// </summary>
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-            ChangeVisualState(false);
-        }
+    #endregion //Base Class Overrides
 
-        #endregion //Base Class Overrides
+    #region Properties
 
-        #region Properties
+    /// <summary>
+    /// Gets or sets a value indicating whether the BusyContent is visible.
+    /// </summary>
+    protected bool IsContentVisible
+    {
+      get;
+      set;
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the BusyContent is visible.
-        /// </summary>
-        protected bool IsContentVisible { get; set; }
+    #endregion //Properties
 
-        #endregion //Properties
+    #region Dependency Properties
 
-        #region Dependency Properties
+    #region IsBusy
 
-        #region IsBusy
+    /// <summary>
+    /// Identifies the IsBusy dependency property.
+    /// </summary>
+    public static readonly DependencyProperty IsBusyProperty = DependencyProperty.Register(
+        "IsBusy",
+        typeof( bool ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( false, new PropertyChangedCallback( OnIsBusyChanged ) ) );
 
-        /// <summary>
-        /// Identifies the IsBusy dependency property.
-        /// </summary>
-        public static readonly DependencyProperty IsBusyProperty = DependencyProperty.Register(
-            "IsBusy",
-            typeof(bool),
-            typeof(BusyIndicator),
-            new PropertyMetadata(false, new PropertyChangedCallback(OnIsBusyChanged)));
+    /// <summary>
+    /// Gets or sets a value indicating whether the busy indicator should show.
+    /// </summary>
+    public bool IsBusy
+    {
+      get
+      {
+        return ( bool )GetValue( IsBusyProperty );
+      }
+      set
+      {
+        SetValue( IsBusyProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the busy indicator should show.
-        /// </summary>
-        public bool IsBusy
-        {
-            get { return (bool)GetValue(IsBusyProperty); }
-            set { SetValue(IsBusyProperty, value); }
-        }
+    /// <summary>
+    /// IsBusyProperty property changed handler.
+    /// </summary>
+    /// <param name="d">BusyIndicator that changed its IsBusy.</param>
+    /// <param name="e">Event arguments.</param>
+    private static void OnIsBusyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ( ( BusyIndicator )d ).OnIsBusyChanged( e );
+    }
 
-        /// <summary>
-        /// IsBusyProperty property changed handler.
-        /// </summary>
-        /// <param name="d">BusyIndicator that changed its IsBusy.</param>
-        /// <param name="e">Event arguments.</param>
-        private static void OnIsBusyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    /// <summary>
+    /// IsBusyProperty property changed handler.
+    /// </summary>
+    /// <param name="e">Event arguments.</param>
+    protected virtual void OnIsBusyChanged( DependencyPropertyChangedEventArgs e )
+    {
+      if( IsBusy )
+      {
+        if( DisplayAfter.Equals( TimeSpan.Zero ) )
         {
-            ((BusyIndicator)d).OnIsBusyChanged(e);
+          // Go visible now
+          IsContentVisible = true;
         }
-
-        /// <summary>
-        /// IsBusyProperty property changed handler.
-        /// </summary>
-        /// <param name="e">Event arguments.</param>
-        protected virtual void OnIsBusyChanged(DependencyPropertyChangedEventArgs e)
+        else
         {
-            if (IsBusy)
-            {
-                if (DisplayAfter.Equals(TimeSpan.Zero))
-                {
-                    // Go visible now
-                    IsContentVisible = true;
-                }
-                else
-                {
-                    // Set a timer to go visible
-                    _displayAfterTimer.Interval = DisplayAfter;
-                    _displayAfterTimer.Start();
-                }
-            }
-            else
-            {
-                // No longer visible
-                _displayAfterTimer.Stop();
-                IsContentVisible = false;
-            }
-
-            ChangeVisualState(true);
+          // Set a timer to go visible
+          _displayAfterTimer.Interval = DisplayAfter;
+          _displayAfterTimer.Start();
         }
+      }
+      else
+      {
+        // No longer visible
+        _displayAfterTimer.Stop();
+        IsContentVisible = false;
+      }
+
+      ChangeVisualState( true );
+    }
 
-        #endregion //IsBusy
+    #endregion //IsBusy
 
-        #region Busy Content
+    #region Busy Content
 
-        /// <summary>
-        /// Identifies the BusyContent dependency property.
-        /// </summary>
-        public static readonly DependencyProperty BusyContentProperty = DependencyProperty.Register(
-            "BusyContent",
-            typeof(object),
-            typeof(BusyIndicator),
-            new PropertyMetadata(null));
+    /// <summary>
+    /// Identifies the BusyContent dependency property.
+    /// </summary>
+    public static readonly DependencyProperty BusyContentProperty = DependencyProperty.Register(
+        "BusyContent",
+        typeof( object ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( null ) );
 
-        /// <summary>
-        /// Gets or sets a value indicating the busy content to display to the user.
-        /// </summary>
-        public object BusyContent
-        {
-            get { return (object)GetValue(BusyContentProperty); }
-            set { SetValue(BusyContentProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets a value indicating the busy content to display to the user.
+    /// </summary>
+    public object BusyContent
+    {
+      get
+      {
+        return ( object )GetValue( BusyContentProperty );
+      }
+      set
+      {
+        SetValue( BusyContentProperty, value );
+      }
+    }
 
-        #endregion //Busy Content
+    #endregion //Busy Content
 
-        #region Busy Content Template
+    #region Busy Content Template
 
-        /// <summary>
-        /// Identifies the BusyTemplate dependency property.
-        /// </summary>
-        public static readonly DependencyProperty BusyContentTemplateProperty = DependencyProperty.Register(
-            "BusyContentTemplate",
-            typeof(DataTemplate),
-            typeof(BusyIndicator),
-            new PropertyMetadata(null));
+    /// <summary>
+    /// Identifies the BusyTemplate dependency property.
+    /// </summary>
+    public static readonly DependencyProperty BusyContentTemplateProperty = DependencyProperty.Register(
+        "BusyContentTemplate",
+        typeof( DataTemplate ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( null ) );
 
-        /// <summary>
-        /// Gets or sets a value indicating the template to use for displaying the busy content to the user.
-        /// </summary>
-        public DataTemplate BusyContentTemplate
-        {
-            get { return (DataTemplate)GetValue(BusyContentTemplateProperty); }
-            set { SetValue(BusyContentTemplateProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets a value indicating the template to use for displaying the busy content to the user.
+    /// </summary>
+    public DataTemplate BusyContentTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( BusyContentTemplateProperty );
+      }
+      set
+      {
+        SetValue( BusyContentTemplateProperty, value );
+      }
+    }
 
-        #endregion //Busy Content Template
+    #endregion //Busy Content Template
 
-        #region Display After
+    #region Display After
 
-        /// <summary>
-        /// Identifies the DisplayAfter dependency property.
-        /// </summary>
-        public static readonly DependencyProperty DisplayAfterProperty = DependencyProperty.Register(
-            "DisplayAfter",
-            typeof(TimeSpan),
-            typeof(BusyIndicator),
-            new PropertyMetadata(TimeSpan.FromSeconds(0.1)));
+    /// <summary>
+    /// Identifies the DisplayAfter dependency property.
+    /// </summary>
+    public static readonly DependencyProperty DisplayAfterProperty = DependencyProperty.Register(
+        "DisplayAfter",
+        typeof( TimeSpan ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( TimeSpan.FromSeconds( 0.1 ) ) );
 
-        /// <summary>
-        /// Gets or sets a value indicating how long to delay before displaying the busy content.
-        /// </summary>
-        public TimeSpan DisplayAfter
-        {
-            get { return (TimeSpan)GetValue(DisplayAfterProperty); }
-            set { SetValue(DisplayAfterProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets a value indicating how long to delay before displaying the busy content.
+    /// </summary>
+    public TimeSpan DisplayAfter
+    {
+      get
+      {
+        return ( TimeSpan )GetValue( DisplayAfterProperty );
+      }
+      set
+      {
+        SetValue( DisplayAfterProperty, value );
+      }
+    }
 
-        #endregion //Display After
+    #endregion //Display After
 
-        #region Overlay Style
+    #region Overlay Style
 
-        /// <summary>
-        /// Identifies the OverlayStyle dependency property.
-        /// </summary>
-        public static readonly DependencyProperty OverlayStyleProperty = DependencyProperty.Register(
-            "OverlayStyle",
-            typeof(Style),
-            typeof(BusyIndicator),
-            new PropertyMetadata(null));
+    /// <summary>
+    /// Identifies the OverlayStyle dependency property.
+    /// </summary>
+    public static readonly DependencyProperty OverlayStyleProperty = DependencyProperty.Register(
+        "OverlayStyle",
+        typeof( Style ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( null ) );
 
-        /// <summary>
-        /// Gets or sets a value indicating the style to use for the overlay.
-        /// </summary>
-        public Style OverlayStyle
-        {
-            get { return (Style)GetValue(OverlayStyleProperty); }
-            set { SetValue(OverlayStyleProperty, value); }
-        }
-        #endregion //Overlay Style
-
-        #region ProgressBar Style
-
-        /// <summary>
-        /// Identifies the ProgressBarStyle dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ProgressBarStyleProperty = DependencyProperty.Register(
-            "ProgressBarStyle",
-            typeof(Style),
-            typeof(BusyIndicator),
-            new PropertyMetadata(null));
-
-        /// <summary>
-        /// Gets or sets a value indicating the style to use for the progress bar.
-        /// </summary>
-        public Style ProgressBarStyle
-        {
-            get { return (Style)GetValue(ProgressBarStyleProperty); }
-            set { SetValue(ProgressBarStyleProperty, value); }
-        }
+    /// <summary>
+    /// Gets or sets a value indicating the style to use for the overlay.
+    /// </summary>
+    public Style OverlayStyle
+    {
+      get
+      {
+        return ( Style )GetValue( OverlayStyleProperty );
+      }
+      set
+      {
+        SetValue( OverlayStyleProperty, value );
+      }
+    }
+    #endregion //Overlay Style
 
-        #endregion //ProgressBar Style
+    #region ProgressBar Style
 
-        #endregion //Dependency Properties
+    /// <summary>
+    /// Identifies the ProgressBarStyle dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ProgressBarStyleProperty = DependencyProperty.Register(
+        "ProgressBarStyle",
+        typeof( Style ),
+        typeof( BusyIndicator ),
+        new PropertyMetadata( null ) );
 
-        #region Methods
+    /// <summary>
+    /// Gets or sets a value indicating the style to use for the progress bar.
+    /// </summary>
+    public Style ProgressBarStyle
+    {
+      get
+      {
+        return ( Style )GetValue( ProgressBarStyleProperty );
+      }
+      set
+      {
+        SetValue( ProgressBarStyleProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Handler for the DisplayAfterTimer.
-        /// </summary>
-        /// <param name="sender">Event sender.</param>
-        /// <param name="e">Event arguments.</param>
-        private void DisplayAfterTimerElapsed(object sender, EventArgs e)
-        {
-            _displayAfterTimer.Stop();
-            IsContentVisible = true;
-            ChangeVisualState(true);
-        }
+    #endregion //ProgressBar Style
 
-        /// <summary>
-        /// Changes the control's visual state(s).
-        /// </summary>
-        /// <param name="useTransitions">True if state transitions should be used.</param>
-        protected virtual void ChangeVisualState(bool useTransitions)
-        {
-            VisualStateManager.GoToState(this, IsBusy ? VisualStates.StateBusy : VisualStates.StateIdle, useTransitions);
-            VisualStateManager.GoToState(this, IsContentVisible ? VisualStates.StateVisible : VisualStates.StateHidden, useTransitions);
-        }
+    #endregion //Dependency Properties
+
+    #region Methods
+
+    /// <summary>
+    /// Handler for the DisplayAfterTimer.
+    /// </summary>
+    /// <param name="sender">Event sender.</param>
+    /// <param name="e">Event arguments.</param>
+    private void DisplayAfterTimerElapsed( object sender, EventArgs e )
+    {
+      _displayAfterTimer.Stop();
+      IsContentVisible = true;
+      ChangeVisualState( true );
+    }
 
-        #endregion //Methods
+    /// <summary>
+    /// Changes the control's visual state(s).
+    /// </summary>
+    /// <param name="useTransitions">True if state transitions should be used.</param>
+    protected virtual void ChangeVisualState( bool useTransitions )
+    {
+      VisualStateManager.GoToState( this, IsBusy ? VisualStates.StateBusy : VisualStates.StateIdle, useTransitions );
+      VisualStateManager.GoToState( this, IsContentVisible ? VisualStates.StateVisible : VisualStates.StateHidden, useTransitions );
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
index 5d78d952..f07928de 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Implementation/VisualStates.BusyIndicator.cs
@@ -1,37 +1,54 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls
 {
-    internal static partial class VisualStates
-    {
-        /// <summary>
-        /// Busyness group name.
-        /// </summary>
-        public const string GroupBusyStatus = "BusyStatusStates";
-
-        /// <summary>
-        /// Busy state for BusyIndicator.
-        /// </summary>
-        public const string StateBusy = "Busy";
-
-        /// <summary>
-        /// Idle state for BusyIndicator.
-        /// </summary>
-        public const string StateIdle = "Idle";
-
-        /// <summary>
-        /// BusyDisplay group.
-        /// </summary>
-        public const string GroupVisibility = "VisibilityStates";
-
-        /// <summary>
-        /// Visible state name for BusyIndicator.
-        /// </summary>
-        public const string StateVisible = "Visible";
-
-        /// <summary>
-        /// Hidden state name for BusyIndicator.
-        /// </summary>
-        public const string StateHidden = "Hidden";
-    }
+  internal static partial class VisualStates
+  {
+    /// <summary>
+    /// Busyness group name.
+    /// </summary>
+    public const string GroupBusyStatus = "BusyStatusStates";
+
+    /// <summary>
+    /// Busy state for BusyIndicator.
+    /// </summary>
+    public const string StateBusy = "Busy";
+
+    /// <summary>
+    /// Idle state for BusyIndicator.
+    /// </summary>
+    public const string StateIdle = "Idle";
+
+    /// <summary>
+    /// BusyDisplay group.
+    /// </summary>
+    public const string GroupVisibility = "VisibilityStates";
+
+    /// <summary>
+    /// Visible state name for BusyIndicator.
+    /// </summary>
+    public const string StateVisible = "Visible";
+
+    /// <summary>
+    /// Hidden state name for BusyIndicator.
+    /// </summary>
+    public const string StateHidden = "Hidden";
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml
index 734bff5a..6ee16c77 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml
@@ -1,144 +1,162 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls">
 
-    <!-- =============================================================================== -->
-    <!-- BusyIndicator                                                                   -->
-    <!-- =============================================================================== -->
+   <!-- =============================================================================== -->
+   <!-- BusyIndicator                                                                   -->
+   <!-- =============================================================================== -->
 
-    <Style TargetType="{x:Type local:BusyIndicator}">
-        <Setter Property="BusyContent" Value="Please wait..."/>
-        <Setter Property="IsTabStop" Value="False"/>
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="OverlayStyle">
-            <Setter.Value>
-                <Style TargetType="Rectangle">
-                    <Setter Property="Fill" Value="White"/>
-                    <Setter Property="Opacity" Value="0.5"/>
-                </Style>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ProgressBarStyle">
-            <Setter.Value>
-                <Style TargetType="ProgressBar">
-                    <Setter Property="IsIndeterminate" Value="True"/>
-                    <Setter Property="Height" Value="15"/>
-                    <Setter Property="Margin" Value="8,0,8,8"/>
-                </Style>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="DisplayAfter" Value="00:00:00.1"/>
-        <Setter Property="HorizontalAlignment" Value="Stretch"/>
-        <Setter Property="VerticalAlignment" Value="Stretch"/>
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:BusyIndicator}">
-                    <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="VisibilityStates">
-                                <VisualState x:Name="Hidden">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Visible">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="BusyStatusStates">
-                                <VisualState x:Name="Idle">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <sys:Boolean>True</sys:Boolean>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Busy">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <sys:Boolean>False</sys:Boolean>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <ContentControl x:Name="content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsTabStop="False" Focusable="False"/>
-                        <Rectangle x:Name="overlay" Style="{TemplateBinding OverlayStyle}"/>
-                        <ContentPresenter x:Name="busycontent">
-                            <ContentPresenter.Content>
-                                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-                                    <Border Background="White" BorderThickness="1" CornerRadius="2">
-                                        <Border.BorderBrush>
-                                            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                                <GradientStop Color="#FFA3AEB9" Offset="0"/>
-                                                <GradientStop Color="#FF8399A9" Offset="0.375"/>
-                                                <GradientStop Color="#FF718597" Offset="0.375"/>
-                                                <GradientStop Color="#FF617584" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Border.BorderBrush>
-                                        <Border CornerRadius="1.5" Margin="1">
-                                            <Border.Background>
-                                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                                    <GradientStop Color="#FFF6F8F9" Offset="0.02"/>
-                                                    <GradientStop Color="#FFB8B8B8" Offset="0.996"/>
-                                                </LinearGradientBrush>
-                                            </Border.Background>
-                                            <Grid MinWidth="150">
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition/>
-                                                    <RowDefinition Height="Auto"/>
-                                                </Grid.RowDefinitions>
-                                                <ContentPresenter Content="{TemplateBinding BusyContent}" ContentTemplate="{TemplateBinding BusyContentTemplate}" Margin="8"/>
-                                                <ProgressBar Grid.Row="1" Style="{TemplateBinding ProgressBarStyle}"/>
-                                            </Grid>
-                                        </Border>
-                                    </Border>
-                                </Grid>
-                            </ContentPresenter.Content>
-                        </ContentPresenter>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style TargetType="{x:Type local:BusyIndicator}">
+      <Setter Property="BusyContent" Value="Please wait..." />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="OverlayStyle">
+         <Setter.Value>
+            <Style TargetType="Rectangle">
+               <Setter Property="Fill" Value="White" />
+               <Setter Property="Opacity" Value="0.5" />
+            </Style>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="ProgressBarStyle">
+         <Setter.Value>
+            <Style TargetType="ProgressBar">
+               <Setter Property="IsIndeterminate" Value="True" />
+               <Setter Property="Height" Value="15" />
+               <Setter Property="Margin" Value="8,0,8,8" />
+            </Style>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="DisplayAfter" Value="00:00:00.1" />
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Stretch" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:BusyIndicator}">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="VisibilityStates">
+                        <VisualState x:Name="Hidden">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Visible">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                     <VisualStateGroup x:Name="BusyStatusStates">
+                        <VisualState x:Name="Idle">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <sys:Boolean>True</sys:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Busy">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <sys:Boolean>False</sys:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <ContentControl x:Name="content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsTabStop="False" Focusable="False" />
+                  <Rectangle x:Name="overlay" Style="{TemplateBinding OverlayStyle}" />
+                  <ContentPresenter x:Name="busycontent">
+                     <ContentPresenter.Content>
+                        <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                           <Border Background="White" BorderThickness="1" CornerRadius="2">
+                              <Border.BorderBrush>
+                                 <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                    <GradientStop Color="#FFA3AEB9" Offset="0" />
+                                    <GradientStop Color="#FF8399A9" Offset="0.375" />
+                                    <GradientStop Color="#FF718597" Offset="0.375" />
+                                    <GradientStop Color="#FF617584" Offset="1" />
+                                 </LinearGradientBrush>
+                              </Border.BorderBrush>
+                              <Border CornerRadius="1.5" Margin="1">
+                                 <Border.Background>
+                                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                       <GradientStop Color="#FFF6F8F9" Offset="0.02" />
+                                       <GradientStop Color="#FFB8B8B8" Offset="0.996" />
+                                    </LinearGradientBrush>
+                                 </Border.Background>
+                                 <Grid MinWidth="150">
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition />
+                                       <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <ContentPresenter Content="{TemplateBinding BusyContent}" ContentTemplate="{TemplateBinding BusyContentTemplate}" Margin="8" />
+                                    <ProgressBar Grid.Row="1" Style="{TemplateBinding ProgressBarStyle}" />
+                                 </Grid>
+                              </Border>
+                           </Border>
+                        </Grid>
+                     </ContentPresenter.Content>
+                  </ContentPresenter>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs
index 0ee66570..271d1686 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ButtonSpinner.cs
@@ -1,236 +1,279 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
+using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Markup;
-using System.Windows.Controls.Primitives;
 
 namespace Microsoft.Windows.Controls
 {
-    /// <summary>
-    /// Represents a spinner control that includes two Buttons.
-    /// </summary>
-    [TemplatePart(Name = PART_IncreaseButton, Type = typeof(ButtonBase))]
-    [TemplatePart(Name = PART_DecreaseButton, Type = typeof(ButtonBase))]
-    [ContentProperty("Content")]
-    public class ButtonSpinner : Spinner
+  /// <summary>
+  /// Represents a spinner control that includes two Buttons.
+  /// </summary>
+  [TemplatePart( Name = PART_IncreaseButton, Type = typeof( ButtonBase ) )]
+  [TemplatePart( Name = PART_DecreaseButton, Type = typeof( ButtonBase ) )]
+  [ContentProperty( "Content" )]
+  public class ButtonSpinner : Spinner
+  {
+    private const string PART_IncreaseButton = "PART_IncreaseButton";
+    private const string PART_DecreaseButton = "PART_DecreaseButton";
+
+    #region Properties
+
+    #region AllowSpin
+
+    public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register( "AllowSpin", typeof( bool ), typeof( ButtonSpinner ), new UIPropertyMetadata( true ) );
+    public bool AllowSpin
     {
-        private const string PART_IncreaseButton = "PART_IncreaseButton";
-        private const string PART_DecreaseButton = "PART_DecreaseButton";
+      get
+      {
+        return ( bool )GetValue( AllowSpinProperty );
+      }
+      set
+      {
+        SetValue( AllowSpinProperty, value );
+      }
+    }
 
-        #region Properties
+    #endregion //AllowSpin
 
-        #region AllowSpin
+    #region Content
 
-        public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register("AllowSpin", typeof(bool), typeof(ButtonSpinner), new UIPropertyMetadata(true));
-        public bool AllowSpin
-        {
-            get { return (bool)GetValue(AllowSpinProperty); }
-            set { SetValue(AllowSpinProperty, value); }
-        }
+    /// <summary>
+    /// Identifies the Content dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ContentProperty = DependencyProperty.Register( "Content", typeof( object ), typeof( ButtonSpinner ), new PropertyMetadata( null, OnContentPropertyChanged ) );
+    public object Content
+    {
+      get
+      {
+        return GetValue( ContentProperty ) as object;
+      }
+      set
+      {
+        SetValue( ContentProperty, value );
+      }
+    }
 
-        #endregion //AllowSpin
+    /// <summary>
+    /// ContentProperty property changed handler.
+    /// </summary>
+    /// <param name="d">ButtonSpinner that changed its Content.</param>
+    /// <param name="e">Event arguments.</param>
+    private static void OnContentPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonSpinner source = d as ButtonSpinner;
+      source.OnContentChanged( e.OldValue, e.NewValue );
+    }
+
+    #endregion //Content
 
-        #region Content
+    #region DecreaseButton
 
-        /// <summary>
-        /// Identifies the Content dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ContentProperty = DependencyProperty.Register("Content", typeof(object), typeof(ButtonSpinner), new PropertyMetadata(null, OnContentPropertyChanged));
-        public object Content
+    private ButtonBase _decreaseButton;
+    /// <summary>
+    /// Gets or sets the DecreaseButton template part.
+    /// </summary>
+    private ButtonBase DecreaseButton
+    {
+      get
+      {
+        return _decreaseButton;
+      }
+      set
+      {
+        if( _decreaseButton != null )
         {
-            get { return GetValue(ContentProperty) as object; }
-            set { SetValue(ContentProperty, value); }
+          _decreaseButton.Click -= OnButtonClick;
         }
 
-        /// <summary>
-        /// ContentProperty property changed handler.
-        /// </summary>
-        /// <param name="d">ButtonSpinner that changed its Content.</param>
-        /// <param name="e">Event arguments.</param>
-        private static void OnContentPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        _decreaseButton = value;
+
+        if( _decreaseButton != null )
         {
-            ButtonSpinner source = d as ButtonSpinner;
-            source.OnContentChanged(e.OldValue, e.NewValue);
+          _decreaseButton.Click += OnButtonClick;
         }
+      }
+    }
 
-        #endregion //Content
+    #endregion //DecreaseButton
 
-        #region DecreaseButton
+    #region IncreaseButton
 
-        private ButtonBase _decreaseButton;
-        /// <summary>
-        /// Gets or sets the DecreaseButton template part.
-        /// </summary>
-        private ButtonBase DecreaseButton
+    private ButtonBase _increaseButton;
+    /// <summary>
+    /// Gets or sets the IncreaseButton template part.
+    /// </summary>
+    private ButtonBase IncreaseButton
+    {
+      get
+      {
+        return _increaseButton;
+      }
+      set
+      {
+        if( _increaseButton != null )
         {
-            get { return _decreaseButton; }
-            set
-            {
-                if (_decreaseButton != null)
-                {
-                    _decreaseButton.Click -= OnButtonClick;
-                }
-
-                _decreaseButton = value;
-
-                if (_decreaseButton != null)
-                {
-                    _decreaseButton.Click += OnButtonClick;
-                }
-            }
+          _increaseButton.Click -= OnButtonClick;
         }
 
-        #endregion //DecreaseButton
+        _increaseButton = value;
 
-        #region IncreaseButton
-
-        private ButtonBase _increaseButton;
-        /// <summary>
-        /// Gets or sets the IncreaseButton template part.
-        /// </summary>
-        private ButtonBase IncreaseButton
+        if( _increaseButton != null )
         {
-            get { return _increaseButton; }
-            set
-            {
-                if (_increaseButton != null)
-                {
-                    _increaseButton.Click -= OnButtonClick;
-                }
-
-                _increaseButton = value;
-
-                if (_increaseButton != null)
-                {
-                    _increaseButton.Click += OnButtonClick;
-                }
-            }
+          _increaseButton.Click += OnButtonClick;
         }
+      }
+    }
 
-        #endregion //IncreaseButton
+    #endregion //IncreaseButton
 
-        #region ShowButtonSpinner
+    #region ShowButtonSpinner
 
-        public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register("ShowButtonSpinner", typeof(bool), typeof(ButtonSpinner), new UIPropertyMetadata(true));
-        public bool ShowButtonSpinner
-        {
-            get { return (bool)GetValue(ShowButtonSpinnerProperty); }
-            set { SetValue(ShowButtonSpinnerProperty, value); }
-        }
+    public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register( "ShowButtonSpinner", typeof( bool ), typeof( ButtonSpinner ), new UIPropertyMetadata( true ) );
+    public bool ShowButtonSpinner
+    {
+      get
+      {
+        return ( bool )GetValue( ShowButtonSpinnerProperty );
+      }
+      set
+      {
+        SetValue( ShowButtonSpinnerProperty, value );
+      }
+    }
 
-        #endregion //ShowButtonSpinner
+    #endregion //ShowButtonSpinner
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region Constructors
+    #region Constructors
 
-        static ButtonSpinner()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(ButtonSpinner), new FrameworkPropertyMetadata(typeof(ButtonSpinner)));
-        }
+    static ButtonSpinner()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ButtonSpinner ), new FrameworkPropertyMetadata( typeof( ButtonSpinner ) ) );
+    }
 
-        #endregion //Constructors
+    #endregion //Constructors
 
-        #region Base Class Overrides
+    #region Base Class Overrides
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-            IncreaseButton = GetTemplateChild(PART_IncreaseButton) as ButtonBase;
-            DecreaseButton = GetTemplateChild(PART_DecreaseButton) as ButtonBase;
+      IncreaseButton = GetTemplateChild( PART_IncreaseButton ) as ButtonBase;
+      DecreaseButton = GetTemplateChild( PART_DecreaseButton ) as ButtonBase;
 
-            SetButtonUsage();
-        }
+      SetButtonUsage();
+    }
 
-        /// <summary>
-        /// Cancel LeftMouseButtonUp events originating from a button that has
-        /// been changed to disabled.
-        /// </summary>
-        /// <param name="e">The data for the event.</param>
-        protected override void OnMouseLeftButtonUp(MouseButtonEventArgs e)
+    /// <summary>
+    /// Cancel LeftMouseButtonUp events originating from a button that has
+    /// been changed to disabled.
+    /// </summary>
+    /// <param name="e">The data for the event.</param>
+    protected override void OnMouseLeftButtonUp( MouseButtonEventArgs e )
+    {
+      base.OnMouseLeftButtonUp( e );
+
+      Point mousePosition;
+      if( IncreaseButton != null && IncreaseButton.IsEnabled == false )
+      {
+        mousePosition = e.GetPosition( IncreaseButton );
+        if( mousePosition.X > 0 && mousePosition.X < IncreaseButton.ActualWidth &&
+            mousePosition.Y > 0 && mousePosition.Y < IncreaseButton.ActualHeight )
         {
-            base.OnMouseLeftButtonUp(e);
-
-            Point mousePosition;
-            if (IncreaseButton != null && IncreaseButton.IsEnabled == false)
-            {
-                mousePosition = e.GetPosition(IncreaseButton);
-                if (mousePosition.X > 0 && mousePosition.X < IncreaseButton.ActualWidth &&
-                    mousePosition.Y > 0 && mousePosition.Y < IncreaseButton.ActualHeight)
-                {
-                    e.Handled = true;
-                }
-            }
-
-            if (DecreaseButton != null && DecreaseButton.IsEnabled == false)
-            {
-                mousePosition = e.GetPosition(DecreaseButton);
-                if (mousePosition.X > 0 && mousePosition.X < DecreaseButton.ActualWidth &&
-                    mousePosition.Y > 0 && mousePosition.Y < DecreaseButton.ActualHeight)
-                {
-                    e.Handled = true;
-                }
-            }
+          e.Handled = true;
         }
+      }
 
-        /// <summary>
-        /// Called when valid spin direction changed.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected override void OnValidSpinDirectionChanged(ValidSpinDirections oldValue, ValidSpinDirections newValue)
+      if( DecreaseButton != null && DecreaseButton.IsEnabled == false )
+      {
+        mousePosition = e.GetPosition( DecreaseButton );
+        if( mousePosition.X > 0 && mousePosition.X < DecreaseButton.ActualWidth &&
+            mousePosition.Y > 0 && mousePosition.Y < DecreaseButton.ActualHeight )
         {
-            SetButtonUsage();
+          e.Handled = true;
         }
+      }
+    }
 
-        #endregion //Base Class Overrides
+    /// <summary>
+    /// Called when valid spin direction changed.
+    /// </summary>
+    /// <param name="oldValue">The old value.</param>
+    /// <param name="newValue">The new value.</param>
+    protected override void OnValidSpinDirectionChanged( ValidSpinDirections oldValue, ValidSpinDirections newValue )
+    {
+      SetButtonUsage();
+    }
 
-        #region Event Handlers
+    #endregion //Base Class Overrides
 
-        /// <summary>
-        /// Handle click event of IncreaseButton and DecreaseButton template parts,
-        /// translating Click to appropriate Spin event.
-        /// </summary>
-        /// <param name="sender">Event sender, should be either IncreaseButton or DecreaseButton template part.</param>
-        /// <param name="e">Event args.</param>
-        private void OnButtonClick(object sender, RoutedEventArgs e)
-        {
-            if (AllowSpin)
-            {
-                SpinDirection direction = sender == IncreaseButton ? SpinDirection.Increase : SpinDirection.Decrease;
-                OnSpin(new SpinEventArgs(direction));
-            }
-        }
+    #region Event Handlers
 
-        #endregion //Event Handlers
+    /// <summary>
+    /// Handle click event of IncreaseButton and DecreaseButton template parts,
+    /// translating Click to appropriate Spin event.
+    /// </summary>
+    /// <param name="sender">Event sender, should be either IncreaseButton or DecreaseButton template part.</param>
+    /// <param name="e">Event args.</param>
+    private void OnButtonClick( object sender, RoutedEventArgs e )
+    {
+      if( AllowSpin )
+      {
+        SpinDirection direction = sender == IncreaseButton ? SpinDirection.Increase : SpinDirection.Decrease;
+        OnSpin( new SpinEventArgs( direction ) );
+      }
+    }
 
-        #region Methods
+    #endregion //Event Handlers
 
-        /// <summary>
-        /// Occurs when the Content property value changed.
-        /// </summary>
-        /// <param name="oldValue">The old value of the Content property.</param>
-        /// <param name="newValue">The new value of the Content property.</param>
-        protected virtual void OnContentChanged(object oldValue, object newValue) { }
+    #region Methods
 
-        /// <summary>
-        /// Disables or enables the buttons based on the valid spin direction.
-        /// </summary>
-        private void SetButtonUsage()
-        {
-            // buttonspinner adds buttons that spin, so disable accordingly.
-            if (IncreaseButton != null)
-            {
-                IncreaseButton.IsEnabled = ((ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase);
-            }
-
-            if (DecreaseButton != null)
-            {
-                DecreaseButton.IsEnabled = ((ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease);
-            }
-        }
+    /// <summary>
+    /// Occurs when the Content property value changed.
+    /// </summary>
+    /// <param name="oldValue">The old value of the Content property.</param>
+    /// <param name="newValue">The new value of the Content property.</param>
+    protected virtual void OnContentChanged( object oldValue, object newValue )
+    {
+    }
 
-        #endregion //Methods
+    /// <summary>
+    /// Disables or enables the buttons based on the valid spin direction.
+    /// </summary>
+    private void SetButtonUsage()
+    {
+      // buttonspinner adds buttons that spin, so disable accordingly.
+      if( IncreaseButton != null )
+      {
+        IncreaseButton.IsEnabled = ( ( ValidSpinDirection & ValidSpinDirections.Increase ) == ValidSpinDirections.Increase );
+      }
+
+      if( DecreaseButton != null )
+      {
+        DecreaseButton.IsEnabled = ( ( ValidSpinDirection & ValidSpinDirections.Decrease ) == ValidSpinDirections.Decrease );
+      }
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs
index aaa121fb..a77309f1 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinDirection.cs
@@ -1,21 +1,38 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls
 {
+  /// <summary>
+  /// Represents spin directions that could be initiated by the end-user.
+  /// </summary>
+  /// <QualityBand>Preview</QualityBand>
+  public enum SpinDirection
+  {
+    /// <summary>
+    /// Represents a spin initiated by the end-user in order to Increase a value.
+    /// </summary>
+    Increase = 0,
+
     /// <summary>
-    /// Represents spin directions that could be initiated by the end-user.
+    /// Represents a spin initiated by the end-user in order to Decrease a value.
     /// </summary>
-    /// <QualityBand>Preview</QualityBand>
-    public enum SpinDirection
-    {
-        /// <summary>
-        /// Represents a spin initiated by the end-user in order to Increase a value.
-        /// </summary>
-        Increase = 0,
-
-        /// <summary>
-        /// Represents a spin initiated by the end-user in order to Decrease a value.
-        /// </summary>
-        Decrease = 1
-    }
+    Decrease = 1
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs
index f8a89385..abfc7413 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/SpinEventArgs.cs
@@ -1,28 +1,49 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 
 namespace Microsoft.Windows.Controls
 {
+  /// <summary>
+  /// Provides data for the Spinner.Spin event.
+  /// </summary>
+  /// <QualityBand>Preview</QualityBand>
+  public class SpinEventArgs : RoutedEventArgs
+  {
+    /// <summary>
+    /// Gets the SpinDirection for the spin that has been initiated by the 
+    /// end-user.
+    /// </summary>
+    public SpinDirection Direction
+    {
+      get;
+      private set;
+    }
+
     /// <summary>
-    /// Provides data for the Spinner.Spin event.
+    /// Initializes a new instance of the SpinEventArgs class.
     /// </summary>
-    /// <QualityBand>Preview</QualityBand>
-    public class SpinEventArgs : RoutedEventArgs
+    /// <param name="direction">Spin direction.</param>
+    public SpinEventArgs( SpinDirection direction )
+      : base()
     {
-        /// <summary>
-        /// Gets the SpinDirection for the spin that has been initiated by the 
-        /// end-user.
-        /// </summary>
-        public SpinDirection Direction { get; private set; }
-
-        /// <summary>
-        /// Initializes a new instance of the SpinEventArgs class.
-        /// </summary>
-        /// <param name="direction">Spin direction.</param>
-        public SpinEventArgs(SpinDirection direction)
-            : base()
-        {
-            Direction = direction;
-        }
+      Direction = direction;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs
index 63b2a22a..acb4c679 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/Spinner.cs
@@ -1,75 +1,103 @@
-using System;
-using System.Windows.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace Microsoft.Windows.Controls
 {
+  /// <summary>
+  /// Base class for controls that represents controls that can spin.
+  /// </summary>
+  public abstract class Spinner : Control
+  {
+    #region Properties
+
     /// <summary>
-    /// Base class for controls that represents controls that can spin.
+    /// Identifies the ValidSpinDirection dependency property.
     /// </summary>
-    public abstract class Spinner : Control
+    public static readonly DependencyProperty ValidSpinDirectionProperty = DependencyProperty.Register( "ValidSpinDirection", typeof( ValidSpinDirections ), typeof( Spinner ), new PropertyMetadata( ValidSpinDirections.Increase | ValidSpinDirections.Decrease, OnValidSpinDirectionPropertyChanged ) );
+    public ValidSpinDirections ValidSpinDirection
     {
-        #region Properties
+      get
+      {
+        return ( ValidSpinDirections )GetValue( ValidSpinDirectionProperty );
+      }
+      set
+      {
+        SetValue( ValidSpinDirectionProperty, value );
+      }
+    }
 
-        /// <summary>
-        /// Identifies the ValidSpinDirection dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ValidSpinDirectionProperty = DependencyProperty.Register("ValidSpinDirection", typeof(ValidSpinDirections), typeof(Spinner), new PropertyMetadata(ValidSpinDirections.Increase | ValidSpinDirections.Decrease, OnValidSpinDirectionPropertyChanged));
-        public ValidSpinDirections ValidSpinDirection
-        {
-            get { return (ValidSpinDirections)GetValue(ValidSpinDirectionProperty); }
-            set { SetValue(ValidSpinDirectionProperty, value); }
-        }
+    /// <summary>
+    /// ValidSpinDirectionProperty property changed handler.
+    /// </summary>
+    /// <param name="d">ButtonSpinner that changed its ValidSpinDirection.</param>
+    /// <param name="e">Event arguments.</param>
+    private static void OnValidSpinDirectionPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Spinner source = ( Spinner )d;
+      ValidSpinDirections oldvalue = ( ValidSpinDirections )e.OldValue;
+      ValidSpinDirections newvalue = ( ValidSpinDirections )e.NewValue;
+      source.OnValidSpinDirectionChanged( oldvalue, newvalue );
+    }
 
-        /// <summary>
-        /// ValidSpinDirectionProperty property changed handler.
-        /// </summary>
-        /// <param name="d">ButtonSpinner that changed its ValidSpinDirection.</param>
-        /// <param name="e">Event arguments.</param>
-        private static void OnValidSpinDirectionPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            Spinner source = (Spinner)d;
-            ValidSpinDirections oldvalue = (ValidSpinDirections)e.OldValue;
-            ValidSpinDirections newvalue = (ValidSpinDirections)e.NewValue;
-            source.OnValidSpinDirectionChanged(oldvalue, newvalue);
-        }
+    #endregion //Properties
 
-        #endregion //Properties
+    /// <summary>
+    /// Occurs when spinning is initiated by the end-user.
+    /// </summary>
+    public event EventHandler<SpinEventArgs> Spin;
 
-        /// <summary>
-        /// Occurs when spinning is initiated by the end-user.
-        /// </summary>
-        public event EventHandler<SpinEventArgs> Spin;
+    /// <summary>
+    /// Initializes a new instance of the Spinner class.
+    /// </summary>
+    protected Spinner()
+    {
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the Spinner class.
-        /// </summary>
-        protected Spinner() { }
+    /// <summary>
+    /// Raises the OnSpin event when spinning is initiated by the end-user.
+    /// </summary>
+    /// <param name="e">Spin event args.</param>
+    protected virtual void OnSpin( SpinEventArgs e )
+    {
+      ValidSpinDirections valid = e.Direction == SpinDirection.Increase ? ValidSpinDirections.Increase : ValidSpinDirections.Decrease;
 
-        /// <summary>
-        /// Raises the OnSpin event when spinning is initiated by the end-user.
-        /// </summary>
-        /// <param name="e">Spin event args.</param>
-        protected virtual void OnSpin(SpinEventArgs e)
+      //Only raise the event if spin is allowed.
+      if( ( ValidSpinDirection & valid ) == valid )
+      {
+        EventHandler<SpinEventArgs> handler = Spin;
+        if( handler != null )
         {
-            ValidSpinDirections valid = e.Direction == SpinDirection.Increase ? ValidSpinDirections.Increase : ValidSpinDirections.Decrease;
-
-            //Only raise the event if spin is allowed.
-            if ((ValidSpinDirection & valid) == valid)
-            {
-                EventHandler<SpinEventArgs> handler = Spin;
-                if (handler != null)
-                {
-                    handler(this, e);
-                }
-            }
+          handler( this, e );
         }
+      }
+    }
 
-        /// <summary>
-        /// Called when valid spin direction changed.
-        /// </summary>
-        /// <param name="oldValue">The old value.</param>
-        /// <param name="newValue">The new value.</param>
-        protected virtual void OnValidSpinDirectionChanged(ValidSpinDirections oldValue, ValidSpinDirections newValue) { }
+    /// <summary>
+    /// Called when valid spin direction changed.
+    /// </summary>
+    /// <param name="oldValue">The old value.</param>
+    /// <param name="newValue">The new value.</param>
+    protected virtual void OnValidSpinDirectionChanged( ValidSpinDirections oldValue, ValidSpinDirections newValue )
+    {
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs
index d744620d..a673376a 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Implementation/ValidSpinDirections.cs
@@ -1,26 +1,44 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 
 namespace Microsoft.Windows.Controls
 {
+  /// <summary>
+  /// Represents spin directions that are valid.
+  /// </summary>
+  [Flags]
+  public enum ValidSpinDirections
+  {
+    /// <summary>
+    /// Can not increase nor decrease.
+    /// </summary>
+    None = 0,
+
+    /// <summary>
+    /// Can increase.
+    /// </summary>
+    Increase = 1,
+
     /// <summary>
-    /// Represents spin directions that are valid.
+    /// Can decrease.
     /// </summary>
-    [Flags]
-    public enum ValidSpinDirections
-    {
-        /// <summary>
-        /// Can not increase nor decrease.
-        /// </summary>
-        None = 0,
-
-        /// <summary>
-        /// Can increase.
-        /// </summary>
-        Increase = 1,
-
-        /// <summary>
-        /// Can decrease.
-        /// </summary>
-        Decrease = 2
-    }
+    Decrease = 2
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
index d0f42c06..cbcec02e 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
@@ -1,71 +1,90 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes">
 
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../../Themes/Generic/Glyphs.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <!-- =============================================================================== -->
-    <!-- ButtonSpinner                                                                   -->
-    <!-- =============================================================================== -->
-
-    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />    
-
-    <Style TargetType="{x:Type local:ButtonSpinner}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="IsTabStop" Value="True" />
-        <Setter Property="Padding" Value="2" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:ButtonSpinner}">
-                    <Grid SnapsToDevicePixels="True">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" />
-
-                        <ContentPresenter Focusable="False" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-                        <Grid Grid.Column="1" Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-
-                            <RepeatButton x:Name="PART_IncreaseButton"
-                                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                                              IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource IncreaseGlyphNormalKey}" />
-
-                            <RepeatButton x:Name="PART_DecreaseButton" Grid.Row="1"
-                                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                                              IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" />
-
-                        </Grid>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-                        </Trigger>
-                        <Trigger SourceName="PART_IncreaseButton" Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_IncreaseButton" Property="ContentTemplate" Value="{StaticResource IncreaseGlyphDisabledKey}" />
-                        </Trigger>
-                        <Trigger SourceName="PART_DecreaseButton" Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_DecreaseButton" Property="ContentTemplate" Value="{StaticResource DecreaseGlyphDisabledKey}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="../../Themes/Generic/Glyphs.xaml" />
+   </ResourceDictionary.MergedDictionaries>
+
+   <!-- =============================================================================== -->
+   <!-- ButtonSpinner                                                                   -->
+   <!-- =============================================================================== -->
+
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+   <Style TargetType="{x:Type local:ButtonSpinner}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="IsTabStop" Value="True" />
+      <Setter Property="Padding" Value="2" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ButtonSpinner}">
+               <Grid SnapsToDevicePixels="True">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="*" />
+                     <ColumnDefinition Width="Auto" />
+                  </Grid.ColumnDefinitions>
+
+                  <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" />
+
+                  <ContentPresenter Focusable="False" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                  <Grid Grid.Column="1" Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="*" />
+                     </Grid.RowDefinitions>
+
+                     <RepeatButton x:Name="PART_IncreaseButton"
+                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource IncreaseGlyphNormalKey}" />
+
+                     <RepeatButton x:Name="PART_DecreaseButton"
+                                   Grid.Row="1"
+                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" />
+
+                  </Grid>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                  </Trigger>
+                  <Trigger SourceName="PART_IncreaseButton" Property="IsEnabled" Value="False">
+                     <Setter TargetName="PART_IncreaseButton" Property="ContentTemplate" Value="{StaticResource IncreaseGlyphDisabledKey}" />
+                  </Trigger>
+                  <Trigger SourceName="PART_DecreaseButton" Property="IsEnabled" Value="False">
+                     <Setter TargetName="PART_DecreaseButton" Property="ContentTemplate" Value="{StaticResource DecreaseGlyphDisabledKey}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs
index 9578da5b..3dae4f1f 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/Calculator.cs
@@ -1,494 +1,546 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using System.Windows.Threading;
 using Microsoft.Windows.Controls.Core.Utilities;
-using System.Collections.Generic;
 
 namespace Microsoft.Windows.Controls
 {
-    public class Calculator : Control
-    {
-        #region Members
+  public class Calculator : Control
+  {
+    #region Members
 
-        private ContentControl _buttonPanel;
-        private bool _showNewNumber = true;
-        private decimal _previousValue;
-        private Operation _lastOperation = Operation.None;
-        private CalculatorButtonType _lastButtonPressed;
-        private readonly Dictionary<Button, DispatcherTimer> _timers = new Dictionary<Button, DispatcherTimer>();
+    private ContentControl _buttonPanel;
+    private bool _showNewNumber = true;
+    private decimal _previousValue;
+    private Operation _lastOperation = Operation.None;
+    private CalculatorButtonType _lastButtonPressed;
+    private readonly Dictionary<Button, DispatcherTimer> _timers = new Dictionary<Button, DispatcherTimer>();
 
-        #endregion //Members
+    #endregion //Members
 
-        #region Enumerations
+    #region Enumerations
 
-        public enum CalculatorButtonType
-        {
-            Add,
-            Back,
-            Cancel,
-            Clear,
-            Decimal,
-            Divide,
-            Eight,
-            Equal,
-            Five,
-            Four,
-            Fraction,
-            MAdd,
-            MC,
-            MR,
-            MS,
-            MSub,
-            Multiply,
-            Negate,
-            Nine,
-            None,
-            One,
-            Percent,
-            Seven,
-            Six,
-            Sqrt,
-            Subtract,
-            Three,
-            Two,
-            Zero
-        }
+    public enum CalculatorButtonType
+    {
+      Add,
+      Back,
+      Cancel,
+      Clear,
+      Decimal,
+      Divide,
+      Eight,
+      Equal,
+      Five,
+      Four,
+      Fraction,
+      MAdd,
+      MC,
+      MR,
+      MS,
+      MSub,
+      Multiply,
+      Negate,
+      Nine,
+      None,
+      One,
+      Percent,
+      Seven,
+      Six,
+      Sqrt,
+      Subtract,
+      Three,
+      Two,
+      Zero
+    }
 
-        public enum Operation
-        {
-            Add,
-            Subtract,
-            Divide,
-            Multiply,
-            Percent,
-            Sqrt,
-            Fraction,
-            None,
-            Clear,
-            Negate
-        }
+    public enum Operation
+    {
+      Add,
+      Subtract,
+      Divide,
+      Multiply,
+      Percent,
+      Sqrt,
+      Fraction,
+      None,
+      Clear,
+      Negate
+    }
 
-        #endregion //Enumerations
+    #endregion //Enumerations
 
-        #region Properties
+    #region Properties
 
-        public ICommand CalculaterButtonClickCommand { get; private set; }
+    public ICommand CalculaterButtonClickCommand
+    {
+      get;
+      private set;
+    }
 
-        #region CalculatorButtonType
+    #region CalculatorButtonType
 
-        public static readonly DependencyProperty CalculatorButtonTypeProperty = DependencyProperty.RegisterAttached("CalculatorButtonType", typeof(CalculatorButtonType), typeof(Calculator), new UIPropertyMetadata(CalculatorButtonType.None, OnCalculatorButtonTypeChanged));
-        public static CalculatorButtonType GetCalculatorButtonType(DependencyObject target)
-        {
-            return (CalculatorButtonType)target.GetValue(CalculatorButtonTypeProperty);
-        }
-        public static void SetCalculatorButtonType(DependencyObject target, CalculatorButtonType value)
-        {
-            target.SetValue(CalculatorButtonTypeProperty, value);
-        }
-        private static void OnCalculatorButtonTypeChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            OnCalculatorButtonTypeChanged(o, (CalculatorButtonType)e.OldValue, (CalculatorButtonType)e.NewValue);
-        }
-        private static void OnCalculatorButtonTypeChanged(DependencyObject o, CalculatorButtonType oldValue, CalculatorButtonType newValue)
-        {
-            Button button = o as Button;
-            button.CommandParameter = newValue;
-            button.Content = CalculatorUtilities.GetCalculatorButtonContent(newValue);
-        }
+    public static readonly DependencyProperty CalculatorButtonTypeProperty = DependencyProperty.RegisterAttached( "CalculatorButtonType", typeof( CalculatorButtonType ), typeof( Calculator ), new UIPropertyMetadata( CalculatorButtonType.None, OnCalculatorButtonTypeChanged ) );
+    public static CalculatorButtonType GetCalculatorButtonType( DependencyObject target )
+    {
+      return ( CalculatorButtonType )target.GetValue( CalculatorButtonTypeProperty );
+    }
+    public static void SetCalculatorButtonType( DependencyObject target, CalculatorButtonType value )
+    {
+      target.SetValue( CalculatorButtonTypeProperty, value );
+    }
+    private static void OnCalculatorButtonTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      OnCalculatorButtonTypeChanged( o, ( CalculatorButtonType )e.OldValue, ( CalculatorButtonType )e.NewValue );
+    }
+    private static void OnCalculatorButtonTypeChanged( DependencyObject o, CalculatorButtonType oldValue, CalculatorButtonType newValue )
+    {
+      Button button = o as Button;
+      button.CommandParameter = newValue;
+      button.Content = CalculatorUtilities.GetCalculatorButtonContent( newValue );
+    }
 
-        #endregion //CalculatorButtonType
+    #endregion //CalculatorButtonType
 
-        #region DisplayText
+    #region DisplayText
 
-        public static readonly DependencyProperty DisplayTextProperty = DependencyProperty.Register("DisplayText", typeof(string), typeof(Calculator), new UIPropertyMetadata("0", OnDisplayTextChanged));
-        public string DisplayText
-        {
-            get { return (string)GetValue(DisplayTextProperty); }
-            set { SetValue(DisplayTextProperty, value); }
-        }
+    public static readonly DependencyProperty DisplayTextProperty = DependencyProperty.Register( "DisplayText", typeof( string ), typeof( Calculator ), new UIPropertyMetadata( "0", OnDisplayTextChanged ) );
+    public string DisplayText
+    {
+      get
+      {
+        return ( string )GetValue( DisplayTextProperty );
+      }
+      set
+      {
+        SetValue( DisplayTextProperty, value );
+      }
+    }
 
-        private static void OnDisplayTextChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            Calculator calculator = o as Calculator;
-            if (calculator != null)
-                calculator.OnDisplayTextChanged((string)e.OldValue, (string)e.NewValue);
-        }
+    private static void OnDisplayTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Calculator calculator = o as Calculator;
+      if( calculator != null )
+        calculator.OnDisplayTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
 
-        protected virtual void OnDisplayTextChanged(string oldValue, string newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
+    protected virtual void OnDisplayTextChanged( string oldValue, string newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
 
-        #endregion //DisplayText
+    #endregion //DisplayText
 
-        #region Memory
+    #region Memory
 
-        public static readonly DependencyProperty MemoryProperty = DependencyProperty.Register("Memory", typeof(decimal), typeof(Calculator), new UIPropertyMetadata(default(decimal)));
-        public decimal Memory
-        {
-            get { return (decimal)GetValue(MemoryProperty); }
-            set { SetValue(MemoryProperty, value); }
-        }
+    public static readonly DependencyProperty MemoryProperty = DependencyProperty.Register( "Memory", typeof( decimal ), typeof( Calculator ), new UIPropertyMetadata( default( decimal ) ) );
+    public decimal Memory
+    {
+      get
+      {
+        return ( decimal )GetValue( MemoryProperty );
+      }
+      set
+      {
+        SetValue( MemoryProperty, value );
+      }
+    }
 
-        #endregion //Memory
+    #endregion //Memory
 
-        #region Precision
+    #region Precision
 
-        public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register("Precision", typeof(int), typeof(Calculator), new UIPropertyMetadata(6));
-        public int Precision
-        {
-            get { return (int)GetValue(PrecisionProperty); }
-            set { SetValue(PrecisionProperty, value); }
-        }
+    public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register( "Precision", typeof( int ), typeof( Calculator ), new UIPropertyMetadata( 6 ) );
+    public int Precision
+    {
+      get
+      {
+        return ( int )GetValue( PrecisionProperty );
+      }
+      set
+      {
+        SetValue( PrecisionProperty, value );
+      }
+    }
 
-        #endregion //Precision
+    #endregion //Precision
 
-        #region Value
+    #region Value
 
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register("Value", typeof(decimal?), typeof(Calculator), new FrameworkPropertyMetadata(default(decimal), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged));
-        public decimal? Value
-        {
-            get { return (decimal?)GetValue(ValueProperty); }
-            set { SetValue(ValueProperty, value); }
-        }
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( decimal? ), typeof( Calculator ), new FrameworkPropertyMetadata( default( decimal ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
+    public decimal? Value
+    {
+      get
+      {
+        return ( decimal? )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
 
-        private static void OnValueChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            Calculator calculator = o as Calculator;
-            if (calculator != null)
-                calculator.OnValueChanged((decimal?)e.OldValue, (decimal?)e.NewValue);
-        }
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Calculator calculator = o as Calculator;
+      if( calculator != null )
+        calculator.OnValueChanged( ( decimal? )e.OldValue, ( decimal? )e.NewValue );
+    }
 
-        protected virtual void OnValueChanged(decimal? oldValue, decimal? newValue)
-        {
-            if (newValue.HasValue)
-                DisplayText = newValue.ToString();
-            else
-                DisplayText = "0";
-
-            RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>(oldValue, newValue);
-            args.RoutedEvent = ValueChangedEvent;
-            RaiseEvent(args);
-        }
+    protected virtual void OnValueChanged( decimal? oldValue, decimal? newValue )
+    {
+      if( newValue.HasValue )
+        DisplayText = newValue.ToString();
+      else
+        DisplayText = "0";
+
+      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
+      args.RoutedEvent = ValueChangedEvent;
+      RaiseEvent( args );
+    }
 
-        #endregion //Value
+    #endregion //Value
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region Constructors
+    #region Constructors
 
-        static Calculator()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(Calculator), new FrameworkPropertyMetadata(typeof(Calculator)));
-        }
+    static Calculator()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( Calculator ), new FrameworkPropertyMetadata( typeof( Calculator ) ) );
+    }
 
-        public Calculator()
-        {
-            CommandBindings.Add(new CommandBinding(CalculatorCommands.CalculatorButtonClick, ExecuteCalculatorButtonClick));
-            AddHandler(MouseDownEvent, new MouseButtonEventHandler(Calculator_OnMouseDown), true);
-        }
+    public Calculator()
+    {
+      CommandBindings.Add( new CommandBinding( CalculatorCommands.CalculatorButtonClick, ExecuteCalculatorButtonClick ) );
+      AddHandler( MouseDownEvent, new MouseButtonEventHandler( Calculator_OnMouseDown ), true );
+    }
 
-        #endregion //Constructors
+    #endregion //Constructors
 
-        #region Base Class Overrides
+    #region Base Class Overrides
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-            _buttonPanel = GetTemplateChild("PART_CalculatorButtonPanel") as ContentControl;
-        }
+      _buttonPanel = GetTemplateChild( "PART_CalculatorButtonPanel" ) as ContentControl;
+    }
 
-        protected override void OnTextInput(TextCompositionEventArgs e)
-        {
-            var buttonType = CalculatorUtilities.GetCalculatorButtonTypeFromText(e.Text);
-            if (buttonType != CalculatorButtonType.None)
-            {
-                SimulateCalculatorButtonClick(buttonType);
-                ProcessCalculatorButton(buttonType);
-            }
-        }
+    protected override void OnTextInput( TextCompositionEventArgs e )
+    {
+      var buttonType = CalculatorUtilities.GetCalculatorButtonTypeFromText( e.Text );
+      if( buttonType != CalculatorButtonType.None )
+      {
+        SimulateCalculatorButtonClick( buttonType );
+        ProcessCalculatorButton( buttonType );
+      }
+    }
 
-        #endregion //Base Class Overrides
+    #endregion //Base Class Overrides
 
-        #region Event Handlers
+    #region Event Handlers
 
-        private void Calculator_OnMouseDown(object sender, MouseButtonEventArgs e)
-        {
-            if (!IsFocused)
-            {
-                Focus();
-                e.Handled = true;
-            }
-        }
+    private void Calculator_OnMouseDown( object sender, MouseButtonEventArgs e )
+    {
+      if( !IsFocused )
+      {
+        Focus();
+        e.Handled = true;
+      }
+    }
 
-        void Timer_Tick(object sender, EventArgs e)
+    void Timer_Tick( object sender, EventArgs e )
+    {
+      DispatcherTimer timer = ( DispatcherTimer )sender;
+      timer.Stop();
+      timer.Tick -= Timer_Tick;
+
+      if( _timers.ContainsValue( timer ) )
+      {
+        var button = _timers.Where( x => x.Value == timer ).Select( x => x.Key ).FirstOrDefault();
+        if( button != null )
         {
-            DispatcherTimer timer = (DispatcherTimer)sender;
-            timer.Stop();
-            timer.Tick -= Timer_Tick;
-
-            if (_timers.ContainsValue(timer))
-            {
-                var button = _timers.Where(x => x.Value == timer).Select(x => x.Key).FirstOrDefault();
-                if (button != null)
-                {
-                    VisualStateManager.GoToState(button, button.IsMouseOver ? "MouseOver" : "Normal", true);
-                    _timers.Remove(button);
-                }
-            }
+          VisualStateManager.GoToState( button, button.IsMouseOver ? "MouseOver" : "Normal", true );
+          _timers.Remove( button );
         }
+      }
+    }
 
-        #endregion //Event Handlers
+    #endregion //Event Handlers
 
-        #region Methods
+    #region Methods
 
-        private void Calculate()
-        {
-            if (_lastOperation == Operation.None)
-                return;
-
-            try
-            {
-                Value = Decimal.Round(CalculateValue(_lastOperation), Precision);
-            }
-            catch
-            {
-                Value = null;
-                DisplayText = "ERROR";
-            }
-        }
+    private void Calculate()
+    {
+      if( _lastOperation == Operation.None )
+        return;
+
+      try
+      {
+        Value = Decimal.Round( CalculateValue( _lastOperation ), Precision );
+      }
+      catch
+      {
+        Value = null;
+        DisplayText = "ERROR";
+      }
+    }
 
-        private void Calculate(Operation newOperation)
-        {
-            if (!_showNewNumber)
-                Calculate();
+    private void Calculate( Operation newOperation )
+    {
+      if( !_showNewNumber )
+        Calculate();
 
-            _lastOperation = newOperation;
-        }
+      _lastOperation = newOperation;
+    }
 
-        private void Calculate(Operation currentOperation, Operation newOperation)
-        {
-            _lastOperation = currentOperation;
-            Calculate();
-            _lastOperation = newOperation;
-        }
+    private void Calculate( Operation currentOperation, Operation newOperation )
+    {
+      _lastOperation = currentOperation;
+      Calculate();
+      _lastOperation = newOperation;
+    }
 
-        private decimal CalculateValue(Operation operation)
-        {
-            decimal newValue = decimal.Zero;
-            decimal currentValue = CalculatorUtilities.ParseDecimal(DisplayText);
-
-            switch (operation)
-            {
-                case Operation.Add:
-                    newValue = CalculatorUtilities.Add(_previousValue, currentValue);
-                    break;
-                case Operation.Subtract:
-                    newValue = CalculatorUtilities.Subtract(_previousValue, currentValue);
-                    break;
-                case Operation.Multiply:
-                    newValue = CalculatorUtilities.Multiply(_previousValue, currentValue);
-                    break;
-                case Operation.Divide:
-                    newValue = CalculatorUtilities.Divide(_previousValue, currentValue);
-                    break;
-                //case Operation.Percent:
-                //    newValue = CalculatorUtilities.Percent(_previousValue, currentValue);
-                //    break;
-                case Operation.Sqrt:
-                    newValue = CalculatorUtilities.SquareRoot(currentValue);
-                    break;
-                case Operation.Fraction:
-                    newValue = CalculatorUtilities.Fraction(currentValue);
-                    break;
-                case Operation.Negate:
-                    newValue = CalculatorUtilities.Negate(currentValue);
-                    break;
-                default:
-                    newValue = decimal.Zero;
-                    break;
-            }
-
-            return newValue;
-        }
+    private decimal CalculateValue( Operation operation )
+    {
+      decimal newValue = decimal.Zero;
+      decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
+
+      switch( operation )
+      {
+        case Operation.Add:
+          newValue = CalculatorUtilities.Add( _previousValue, currentValue );
+          break;
+        case Operation.Subtract:
+          newValue = CalculatorUtilities.Subtract( _previousValue, currentValue );
+          break;
+        case Operation.Multiply:
+          newValue = CalculatorUtilities.Multiply( _previousValue, currentValue );
+          break;
+        case Operation.Divide:
+          newValue = CalculatorUtilities.Divide( _previousValue, currentValue );
+          break;
+        //case Operation.Percent:
+        //    newValue = CalculatorUtilities.Percent(_previousValue, currentValue);
+        //    break;
+        case Operation.Sqrt:
+          newValue = CalculatorUtilities.SquareRoot( currentValue );
+          break;
+        case Operation.Fraction:
+          newValue = CalculatorUtilities.Fraction( currentValue );
+          break;
+        case Operation.Negate:
+          newValue = CalculatorUtilities.Negate( currentValue );
+          break;
+        default:
+          newValue = decimal.Zero;
+          break;
+      }
+
+      return newValue;
+    }
 
-        void ProcessBackKey()
-        {
-            string displayText;
-            if (DisplayText.Length > 1 && !(DisplayText.Length == 2 && DisplayText[0] == '-'))
-            {
-                displayText = DisplayText.Remove(DisplayText.Length - 1, 1);
-            }
-            else
-            {
-                displayText = "0";
-                _showNewNumber = true;
-            }
-
-            DisplayText = displayText;
-        }
+    void ProcessBackKey()
+    {
+      string displayText;
+      if( DisplayText.Length > 1 && !( DisplayText.Length == 2 && DisplayText[ 0 ] == '-' ) )
+      {
+        displayText = DisplayText.Remove( DisplayText.Length - 1, 1 );
+      }
+      else
+      {
+        displayText = "0";
+        _showNewNumber = true;
+      }
+
+      DisplayText = displayText;
+    }
 
-        private void ProcessCalculatorButton(CalculatorButtonType buttonType)
-        {
-            if (CalculatorUtilities.IsDigit(buttonType))
-                ProcessDigitKey(buttonType);
-            else if ((CalculatorUtilities.IsMemory(buttonType)))
-                ProcessMemoryKey(buttonType);
-            else
-                ProcessOperationKey(buttonType);
-
-            _lastButtonPressed = buttonType;
-        }
+    private void ProcessCalculatorButton( CalculatorButtonType buttonType )
+    {
+      if( CalculatorUtilities.IsDigit( buttonType ) )
+        ProcessDigitKey( buttonType );
+      else if( ( CalculatorUtilities.IsMemory( buttonType ) ) )
+        ProcessMemoryKey( buttonType );
+      else
+        ProcessOperationKey( buttonType );
+
+      _lastButtonPressed = buttonType;
+    }
 
-        private void ProcessDigitKey(CalculatorButtonType buttonType)
-        {
-            if (_showNewNumber)
-                DisplayText = CalculatorUtilities.GetCalculatorButtonContent(buttonType);
-            else
-                DisplayText += CalculatorUtilities.GetCalculatorButtonContent(buttonType);
+    private void ProcessDigitKey( CalculatorButtonType buttonType )
+    {
+      if( _showNewNumber )
+        DisplayText = CalculatorUtilities.GetCalculatorButtonContent( buttonType );
+      else
+        DisplayText += CalculatorUtilities.GetCalculatorButtonContent( buttonType );
 
-            _showNewNumber = false;
-        }
+      _showNewNumber = false;
+    }
 
-        private void ProcessMemoryKey(Calculator.CalculatorButtonType buttonType)
-        {
-            decimal currentValue = CalculatorUtilities.ParseDecimal(DisplayText);
-
-            switch (buttonType)
-            {
-                case Calculator.CalculatorButtonType.MAdd:
-                    Memory += currentValue;
-                    break;
-                case Calculator.CalculatorButtonType.MC:
-                    Memory = decimal.Zero;
-                    break;
-                case Calculator.CalculatorButtonType.MR:
-                    DisplayText = Memory.ToString();
-                    break;
-                case Calculator.CalculatorButtonType.MS:
-                    Memory = currentValue;
-                    break;
-                case Calculator.CalculatorButtonType.MSub:
-                    Memory -= currentValue;
-                    break;
-                default:
-                    break;
-            }
+    private void ProcessMemoryKey( Calculator.CalculatorButtonType buttonType )
+    {
+      decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
+
+      switch( buttonType )
+      {
+        case Calculator.CalculatorButtonType.MAdd:
+          Memory += currentValue;
+          break;
+        case Calculator.CalculatorButtonType.MC:
+          Memory = decimal.Zero;
+          break;
+        case Calculator.CalculatorButtonType.MR:
+          DisplayText = Memory.ToString();
+          break;
+        case Calculator.CalculatorButtonType.MS:
+          Memory = currentValue;
+          break;
+        case Calculator.CalculatorButtonType.MSub:
+          Memory -= currentValue;
+          break;
+        default:
+          break;
+      }
+
+      _showNewNumber = true;
+    }
 
+    private void ProcessOperationKey( CalculatorButtonType buttonType )
+    {
+      switch( buttonType )
+      {
+        case CalculatorButtonType.Add:
+          Calculate( Operation.Add );
+          break;
+        case CalculatorButtonType.Subtract:
+          Calculate( Operation.Subtract );
+          break;
+        case CalculatorButtonType.Multiply:
+          Calculate( Operation.Multiply );
+          break;
+        case CalculatorButtonType.Divide:
+          Calculate( Operation.Divide );
+          break;
+        case CalculatorButtonType.Percent:
+          if( _lastOperation != Operation.None )
+          {
+            decimal currentValue = CalculatorUtilities.ParseDecimal( DisplayText );
+            decimal newValue = CalculatorUtilities.Percent( _previousValue, currentValue );
+            DisplayText = newValue.ToString();
+          }
+          else
+          {
+            DisplayText = "0";
             _showNewNumber = true;
-        }
+          }
+          return;
+        case CalculatorButtonType.Sqrt:
+          Calculate( Operation.Sqrt, Operation.None );
+          break;
+        case CalculatorButtonType.Fraction:
+          Calculate( Operation.Fraction, Operation.None );
+          break;
+        case CalculatorButtonType.Negate:
+          Calculate( Operation.Negate, Operation.None );
+          break;
+        case CalculatorButtonType.Equal:
+          Calculate( Operation.None );
+          break;
+        case CalculatorButtonType.Clear:
+          Calculate( Operation.Clear, Operation.None );
+          DisplayText = Value.ToString();
+          break;
+        case CalculatorButtonType.Cancel:
+          DisplayText = _previousValue.ToString();
+          _lastOperation = Operation.None;
+          _showNewNumber = true;
+          return;
+        case CalculatorButtonType.Back:
+          ProcessBackKey();
+          return;
+        default:
+          break;
+      }
+
+      Decimal.TryParse( DisplayText, out _previousValue );
+      _showNewNumber = true;
+    }
 
-        private void ProcessOperationKey(CalculatorButtonType buttonType)
+    private void SimulateCalculatorButtonClick( CalculatorButtonType buttonType )
+    {
+      var button = CalculatorUtilities.FindButtonByCalculatorButtonType( _buttonPanel, buttonType );
+      if( button != null )
+      {
+        VisualStateManager.GoToState( button, "Pressed", true );
+        DispatcherTimer timer;
+        if( _timers.ContainsKey( button ) )
         {
-            switch (buttonType)
-            {
-                case CalculatorButtonType.Add:
-                    Calculate(Operation.Add);
-                    break;
-                case CalculatorButtonType.Subtract:
-                    Calculate(Operation.Subtract);
-                    break;
-                case CalculatorButtonType.Multiply:
-                    Calculate(Operation.Multiply);
-                    break;
-                case CalculatorButtonType.Divide:
-                    Calculate(Operation.Divide);
-                    break;
-                case CalculatorButtonType.Percent:
-                    if (_lastOperation != Operation.None)
-                    {
-                        decimal currentValue = CalculatorUtilities.ParseDecimal(DisplayText);
-                        decimal newValue = CalculatorUtilities.Percent(_previousValue, currentValue);
-                        DisplayText = newValue.ToString();
-                    }
-                    else
-                    {
-                        DisplayText = "0";
-                        _showNewNumber = true;
-                    }
-                    return;
-                case CalculatorButtonType.Sqrt:
-                    Calculate(Operation.Sqrt, Operation.None);
-                    break;
-                case CalculatorButtonType.Fraction:
-                    Calculate(Operation.Fraction, Operation.None);
-                    break;
-                case CalculatorButtonType.Negate:
-                    Calculate(Operation.Negate, Operation.None);
-                    break;
-                case CalculatorButtonType.Equal:
-                    Calculate(Operation.None);
-                    break;
-                case CalculatorButtonType.Clear:
-                    Calculate(Operation.Clear, Operation.None);
-                    DisplayText = Value.ToString();
-                    break;
-                case CalculatorButtonType.Cancel:
-                    DisplayText = _previousValue.ToString();
-                    _lastOperation = Operation.None;
-                    _showNewNumber = true;
-                    return;
-                case CalculatorButtonType.Back:
-                    ProcessBackKey();
-                    return;
-                default:
-                    break;
-            }
-
-            Decimal.TryParse(DisplayText, out _previousValue);
-            _showNewNumber = true;
+          timer = _timers[ button ];
+          timer.Stop();
         }
-
-        private void SimulateCalculatorButtonClick(CalculatorButtonType buttonType)
+        else
         {
-            var button = CalculatorUtilities.FindButtonByCalculatorButtonType(_buttonPanel, buttonType);
-            if (button != null)
-            {
-                VisualStateManager.GoToState(button, "Pressed", true);
-                DispatcherTimer timer;
-                if (_timers.ContainsKey(button))
-                {
-                    timer = _timers[button];
-                    timer.Stop();
-                }
-                else
-                {
-                    timer = new DispatcherTimer();
-                    timer.Interval = TimeSpan.FromMilliseconds(100);
-                    timer.Tick += Timer_Tick;
-                    _timers.Add(button, timer);
-                }
-
-                timer.Start();
-            }
+          timer = new DispatcherTimer();
+          timer.Interval = TimeSpan.FromMilliseconds( 100 );
+          timer.Tick += Timer_Tick;
+          _timers.Add( button, timer );
         }
 
-        #endregion //Methods
+        timer.Start();
+      }
+    }
 
-        #region Events
+    #endregion //Methods
 
-        //Due to a bug in Visual Studio, you cannot create event handlers for nullable args in XAML, so I have to use object instead.
-        public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble, typeof(RoutedPropertyChangedEventHandler<object>), typeof(Calculator));
-        public event RoutedPropertyChangedEventHandler<object> ValueChanged
-        {
-            add { AddHandler(ValueChangedEvent, value); }
-            remove { RemoveHandler(ValueChangedEvent, value); }
-        }
+    #region Events
 
-        #endregion //Events
+    //Due to a bug in Visual Studio, you cannot create event handlers for nullable args in XAML, so I have to use object instead.
+    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( Calculator ) );
+    public event RoutedPropertyChangedEventHandler<object> ValueChanged
+    {
+      add
+      {
+        AddHandler( ValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ValueChangedEvent, value );
+      }
+    }
 
-        #region Commands
+    #endregion //Events
 
-        private void ExecuteCalculatorButtonClick(object sender, ExecutedRoutedEventArgs e)
-        {
-            var buttonType = (CalculatorButtonType)e.Parameter;
-            ProcessCalculatorButton(buttonType);
-        }
+    #region Commands
 
-        #endregion //Commands
+    private void ExecuteCalculatorButtonClick( object sender, ExecutedRoutedEventArgs e )
+    {
+      var buttonType = ( CalculatorButtonType )e.Parameter;
+      ProcessCalculatorButton( buttonType );
     }
+
+    #endregion //Commands
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs
index 47fbc8df..f5aa6874 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Implementation/CalculatorCommands.cs
@@ -1,14 +1,34 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls
 {
-    public static class CalculatorCommands
+  public static class CalculatorCommands
+  {
+    private static RoutedCommand _calculatorButtonClickCommand = new RoutedCommand();
+    public static RoutedCommand CalculatorButtonClick
     {
-        private static RoutedCommand _calculatorButtonClickCommand = new RoutedCommand();
-        public static RoutedCommand CalculatorButtonClick
-        {
-            get { return _calculatorButtonClickCommand; }
-        }
+      get
+      {
+        return _calculatorButtonClickCommand;
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml
index 37529ff7..bd37b1dc 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml
@@ -1,496 +1,518 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
-                    xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters" >
-
-    <coreConverters:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
-
-    <Style x:Key="CalculatorOperatorButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="Foreground" Value="#FF5B636E"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid x:Name="Control">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5"/>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="MemoryStates">
-                                <VisualState x:Name="EmptyMemory"/>
-                                <VisualState x:Name="MemoryAssigned">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Border1" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Border2" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Border Background="White" BorderBrush="{x:Null}" BorderThickness="0" CornerRadius="2" Margin="0,0,0,-1" Opacity="0.5"/>
-                        <Grid x:Name="PART_Default">
-                            <Border BorderThickness="0" CornerRadius="2" Background="#FF9CA2AB">
-                                <Grid>
-                                    <Border x:Name="PART_Border1" BorderThickness="0" CornerRadius="1" Margin="1">
-                                        <Border.Background>
-                                            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                                <GradientStop Color="#FFEDF1F7" Offset="0"/>
-                                                <GradientStop Color="#FFD5DBE3" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Border.Background>
-                                        <Border BorderThickness="0" CornerRadius="1" Margin="2">
-                                            <Border.Background>
-                                                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                                    <GradientStop Color="#FFEDF1F7" Offset="0"/>
-                                                    <GradientStop Color="#FFD5DBE3" Offset="1"/>
-                                                </LinearGradientBrush>
-                                            </Border.Background>
-                                        </Border>
-                                    </Border>
-                                    <Border x:Name="PART_Border2" BorderThickness="0" CornerRadius="1" Margin="1" Opacity="0">
-                                        <Border.Background>
-                                            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                                <GradientStop Color="#FF9CA2AB" Offset="0"/>
-                                                <GradientStop Color="#FF9CA2AB" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Border.Background>
-                                        <Border BorderThickness="0" CornerRadius="1" Margin="2">
-                                            <Border.Background>
-                                                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                                    <GradientStop Color="#FFEDF1F7" Offset="0"/>
-                                                    <GradientStop Color="#FFD5DBE3" Offset="1"/>
-                                                </LinearGradientBrush>
-                                            </Border.Background>
-                                        </Border>
-                                    </Border>
-                                </Grid>
-                            </Border>
-                        </Grid>
-                        <Grid x:Name="PART_MouseOver" Opacity="0">
-                            <Border BorderThickness="0" CornerRadius="2" Background="#FF9CA2AB">
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1">
-                                    <Border.Background>
-                                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                            <GradientStop Color="#FFFDFEFF" Offset="0"/>
-                                            <GradientStop Color="#FFD9DFE8" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Border.Background>
-                                </Border>
-                            </Border>
-                        </Grid>
-                        <Grid x:Name="PART_Pressed" Opacity="0">
-                            <Border BorderThickness="0" CornerRadius="2" Background="#FF90959D">
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFB5BBC5"/>
-                            </Border>
-                        </Grid>
-                        <ContentPresenter x:Name="contentPresenter"
-							HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-							SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="CalculatorClearButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="Foreground" Value="#FFBF5254"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid x:Name="Control">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5"/>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Border Background="White" BorderBrush="{x:Null}" BorderThickness="0" CornerRadius="2" Margin="0,0,0,-1" Opacity="0.5"/>
-                        <Grid x:Name="PART_Default">
-                            <Border BorderThickness="0" CornerRadius="2">
-                                <Border.Background>
+                    xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
+
+   <coreConverters:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
+
+   <Style x:Key="CalculatorOperatorButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="#FF5B636E" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid x:Name="Control">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Disabled">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                     <VisualStateGroup x:Name="MemoryStates">
+                        <VisualState x:Name="EmptyMemory" />
+                        <VisualState x:Name="MemoryAssigned">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Border1" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Border2" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border Background="White" BorderBrush="{x:Null}" BorderThickness="0" CornerRadius="2" Margin="0,0,0,-1" Opacity="0.5" />
+                  <Grid x:Name="PART_Default">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF9CA2AB">
+                        <Grid>
+                           <Border x:Name="PART_Border1" BorderThickness="0" CornerRadius="1" Margin="1">
+                              <Border.Background>
+                                 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                    <GradientStop Color="#FFEDF1F7" Offset="0" />
+                                    <GradientStop Color="#FFD5DBE3" Offset="1" />
+                                 </LinearGradientBrush>
+                              </Border.Background>
+                              <Border BorderThickness="0" CornerRadius="1" Margin="2">
+                                 <Border.Background>
                                     <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                        <GradientStop Color="#FFC19497" Offset="0"/>
-                                        <GradientStop Color="#FFA67D80" Offset="1"/>
+                                       <GradientStop Color="#FFEDF1F7" Offset="0" />
+                                       <GradientStop Color="#FFD5DBE3" Offset="1" />
                                     </LinearGradientBrush>
-                                </Border.Background>
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1">
-                                    <Border.Background>
-                                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                            <GradientStop Color="#FFFDB8B8" Offset="0"/>
-                                            <GradientStop Color="#FFF39998" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Border.Background>
-                                </Border>
-                            </Border>
-                        </Grid>
-                        <Grid x:Name="PART_MouseOver" Opacity="0">
-                            <Border BorderThickness="0" CornerRadius="2">
-                                <Border.Background>
+                                 </Border.Background>
+                              </Border>
+                           </Border>
+                           <Border x:Name="PART_Border2" BorderThickness="0" CornerRadius="1" Margin="1" Opacity="0">
+                              <Border.Background>
+                                 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                    <GradientStop Color="#FF9CA2AB" Offset="0" />
+                                    <GradientStop Color="#FF9CA2AB" Offset="1" />
+                                 </LinearGradientBrush>
+                              </Border.Background>
+                              <Border BorderThickness="0" CornerRadius="1" Margin="2">
+                                 <Border.Background>
                                     <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                        <GradientStop Color="#FFC19497" Offset="0"/>
-                                        <GradientStop Color="#FFA67D80" Offset="1"/>
+                                       <GradientStop Color="#FFEDF1F7" Offset="0" />
+                                       <GradientStop Color="#FFD5DBE3" Offset="1" />
                                     </LinearGradientBrush>
-                                </Border.Background>
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1">
-                                    <Border.Background>
-                                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                            <GradientStop Color="#FFFEC9C9" Offset="0"/>
-                                            <GradientStop Color="#FFEAA4A3" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Border.Background>
-                                </Border>
-                            </Border>
-                        </Grid>
-                        <Grid x:Name="PART_Pressed" Opacity="0">
-                            <Border BorderThickness="0" CornerRadius="2" Background="#FF9B6F72">
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFE69197"/>
-                            </Border>
-                        </Grid>
-                        <ContentPresenter x:Name="contentPresenter"
-							HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-							SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="CalculatorDigitButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Foreground" Value="#FF2A313A"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid x:Name="Control">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5"/>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Border BorderBrush="{x:Null}" BorderThickness="0" Background="White" CornerRadius="3" Margin="0,0,0,-1" Opacity="0.5"/>
-                        <Grid x:Name="PART_Default">
-                            <Border BorderThickness="0" CornerRadius="2">
-                                <Border.Background>
-                                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                        <GradientStop Color="#FFA9AAAB" Offset="0"/>
-                                        <GradientStop Color="#FF98999A" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Border.Background>
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1">
-                                    <Border.Background>
-                                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                            <GradientStop Color="#FFF6F7F7" Offset="0"/>
-                                            <GradientStop Color="#FFDEE0E2" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Border.Background>
-                                </Border>
-                            </Border>
-                        </Grid>
-                        <Grid x:Name="PART_MouseOver" Opacity="0">
-                            <Border BorderThickness="0" CornerRadius="2">
-                                <Border.Background>
-                                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                        <GradientStop Color="#FFA9AAAB" Offset="0"/>
-                                        <GradientStop Color="#FF98999A" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Border.Background>
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1">
-                                    <Border.Background>
-                                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                            <GradientStop Color="#FFFCFCFC" Offset="0"/>
-                                            <GradientStop Color="#FFEEEFF2" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Border.Background>
-                                </Border>
-                            </Border>
-                        </Grid>
-                        <Grid x:Name="PART_Pressed" Opacity="0">
-                            <Border BorderThickness="0" CornerRadius="2" Background="#FF87888A">
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFB5BBC5"/>
-                            </Border>
-                        </Grid>
-                        <ContentPresenter x:Name="contentPresenter"
-							HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-							SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-
-    <ControlTemplate x:Key="CalculatorButtonPanel" TargetType="{x:Type ContentControl}">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="3"/>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="3"/>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="3"/>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="3"/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition/>
-                <RowDefinition Height="3"/>
-                <RowDefinition/>
-                <RowDefinition Height="3"/>
-                <RowDefinition/>
-                <RowDefinition Height="3"/>
-                <RowDefinition/>
-                <RowDefinition Height="3"/>
-                <RowDefinition/>
-                <RowDefinition Height="3"/>
-                <RowDefinition/>
-            </Grid.RowDefinitions>
-            <Button Grid.Column="0" Grid.Row="0" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="MC"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="2" Grid.Row="0" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="MR" 
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="0" Grid.Row="2" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Back" 
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}" Grid.RowSpan="1"/>
-
-            <Button Grid.Column="2" Grid.Row="2" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Cancel" 
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorClearButtonStyle}"/>
-
-            <Button Grid.Column="4" Grid.Row="2" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Clear"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorClearButtonStyle}" Grid.ColumnSpan="1" Grid.RowSpan="1"/>
-
-            <Button Grid.Column="4" Grid.Row="0" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="MS"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="6" Grid.Row="0" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="MAdd"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}" Margin="0"/>
-
-            <Button Grid.Column="8" Grid.Row="0" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="MSub"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="6" Grid.Row="2" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Negate"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="8" Grid.Row="2" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Sqrt"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="0" Grid.Row="4" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Seven"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="2" Grid.Row="4" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Eight"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="4" Grid.Row="4" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Nine"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="6" Grid.Row="4" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Divide"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="8" Grid.Row="4" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Percent"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="0" Grid.Row="6" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Four"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="2" Grid.Row="6" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Five"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="4" Grid.Row="6" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Six"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="6" Grid.Row="6" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Multiply"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="8" Grid.Row="6" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Fraction"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="0" Grid.Row="8" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="One"
-					Command="local:CalculatorCommands.CalculatorButtonClick"                                    
-					Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="2" Grid.Row="8" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Two"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="4" Grid.Row="8" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Three"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="6" Grid.Row="8" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Subtract"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="8" Grid.Row="8" Grid.RowSpan="3" MinWidth="28" MinHeight="55"
-					local:Calculator.CalculatorButtonType="Equal"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="3" MinWidth="59" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Zero"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="4" Grid.Row="10" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Decimal"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="10" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Add"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-        </Grid>
-    </ControlTemplate>
-
-    <Style TargetType="{x:Type local:Calculator}">
-        <Setter Property="Background">
-            <Setter.Value>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="#FFFAFBFB" Offset="0"/>
-                    <GradientStop Color="#FFF4F4F4" Offset="1"/>
-                </LinearGradientBrush>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="BorderBrush" Value="#FF949494" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:Calculator}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="3">
-                        <Grid Margin="10">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Border x:Name="PART_Display" Margin="0,0,0,10" Background="White" BorderBrush="#FF949494" BorderThickness="1">
-                                <StackPanel>
-                                    <Path Stretch="Fill" Height="9" Width="9" Fill="DarkGray"
-                                          Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
-                                          HorizontalAlignment="Left" VerticalAlignment="Top"                                              
-                                          Margin="4,4,0,0"
-                                          Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}"/>
-                                    <TextBlock FontSize="18"
-                                               HorizontalAlignment="Right"
-                                               Margin="0,0,4,0"
-                                               Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" />
-                                </StackPanel>
-                            </Border>
-                            <ContentControl x:Name="PART_CalculatorButtonPanel" Grid.Row="1" Template="{StaticResource CalculatorButtonPanel}" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
+                                 </Border.Background>
+                              </Border>
+                           </Border>
                         </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="PART_Display" Property="Background" Value="#E7F5FF" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_MouseOver" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF9CA2AB">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFDFEFF" Offset="0" />
+                                 <GradientStop Color="#FFD9DFE8" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_Pressed" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF90959D">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFB5BBC5" />
+                     </Border>
+                  </Grid>
+                  <ContentPresenter x:Name="contentPresenter"
+							               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="CalculatorClearButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="#FFBF5254" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid x:Name="Control">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Disabled">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border Background="White" BorderBrush="{x:Null}" BorderThickness="0" CornerRadius="2" Margin="0,0,0,-1" Opacity="0.5" />
+                  <Grid x:Name="PART_Default">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFC19497" Offset="0" />
+                              <GradientStop Color="#FFA67D80" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFDB8B8" Offset="0" />
+                                 <GradientStop Color="#FFF39998" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_MouseOver" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFC19497" Offset="0" />
+                              <GradientStop Color="#FFA67D80" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFEC9C9" Offset="0" />
+                                 <GradientStop Color="#FFEAA4A3" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_Pressed" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF9B6F72">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFE69197" />
+                     </Border>
+                  </Grid>
+                  <ContentPresenter x:Name="contentPresenter"
+							               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="CalculatorDigitButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="#FF2A313A" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid x:Name="Control">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Disabled">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border BorderBrush="{x:Null}" BorderThickness="0" Background="White" CornerRadius="3" Margin="0,0,0,-1" Opacity="0.5" />
+                  <Grid x:Name="PART_Default">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFA9AAAB" Offset="0" />
+                              <GradientStop Color="#FF98999A" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFF6F7F7" Offset="0" />
+                                 <GradientStop Color="#FFDEE0E2" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_MouseOver" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFA9AAAB" Offset="0" />
+                              <GradientStop Color="#FF98999A" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFCFCFC" Offset="0" />
+                                 <GradientStop Color="#FFEEEFF2" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_Pressed" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF87888A">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFB5BBC5" />
+                     </Border>
+                  </Grid>
+                  <ContentPresenter x:Name="contentPresenter"
+							               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+
+   <ControlTemplate x:Key="CalculatorButtonPanel" TargetType="{x:Type ContentControl}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+         </Grid.RowDefinitions>
+         <Button Grid.Column="0" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MC"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MR" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Back" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" Grid.RowSpan="1" />
+
+         <Button Grid.Column="2" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Cancel" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorClearButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Clear"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorClearButtonStyle}" Grid.ColumnSpan="1" Grid.RowSpan="1" />
+
+         <Button Grid.Column="4" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MS"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MAdd"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" Margin="0" />
+
+         <Button Grid.Column="8" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MSub"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Negate"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Sqrt"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Seven"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Eight"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Nine"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Divide"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Percent"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Four"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Five"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Six"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Multiply"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Fraction"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="One"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"                                    
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Two"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Three"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Subtract"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="8" Grid.RowSpan="3" MinWidth="28" MinHeight="55"
+					  local:Calculator.CalculatorButtonType="Equal"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="3" MinWidth="59" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Zero"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="10" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Decimal"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="10" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Add"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+      </Grid>
+   </ControlTemplate>
+
+   <Style TargetType="{x:Type local:Calculator}">
+      <Setter Property="Background">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+               <GradientStop Color="#FFFAFBFB" Offset="0" />
+               <GradientStop Color="#FFF4F4F4" Offset="1" />
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderBrush" Value="#FF949494" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:Calculator}">
+               <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       CornerRadius="3">
+                  <Grid Margin="10">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                     </Grid.RowDefinitions>
+                     <Border x:Name="PART_Display" Margin="0,0,0,10" Background="White" BorderBrush="#FF949494" BorderThickness="1">
+                        <StackPanel>
+                           <Path Stretch="Fill"
+                                 Height="9"
+                                 Width="9"
+                                 Fill="DarkGray"
+                                 Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
+                                 HorizontalAlignment="Left"
+                                 VerticalAlignment="Top"                                              
+                                 Margin="4,4,0,0"
+                                 Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}" />
+                           <TextBlock FontSize="18"
+                                      HorizontalAlignment="Right"
+                                      Margin="0,0,4,0"
+                                      Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </StackPanel>
+                     </Border>
+                     <ContentControl x:Name="PART_CalculatorButtonPanel" Grid.Row="1" Template="{StaticResource CalculatorButtonPanel}" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsFocused" Value="True">
+                     <Setter TargetName="PART_Display" Property="Background" Value="#E7F5FF" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs
index de477bf9..6f4eb016 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Implementation/CalculatorUpDown.cs
@@ -1,171 +1,219 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
-using System.Windows.Input;
 using System.Windows.Controls.Primitives;
+using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls
 {
-    public class CalculatorUpDown : DecimalUpDown
-    {
-        #region Members
+  public class CalculatorUpDown : DecimalUpDown
+  {
+    #region Members
+
+    private Popup _calculatorPopup;
+    private Calculator _calculator;
 
-        private Popup _calculatorPopup;
-        private Calculator _calculator;
+    #endregion //Members
 
-        #endregion //Members
+    #region Properties
 
-        #region Properties
+    #region DisplayText
 
-        #region DisplayText
+    public static readonly DependencyProperty DisplayTextProperty = DependencyProperty.Register( "DisplayText", typeof( string ), typeof( CalculatorUpDown ), new UIPropertyMetadata( "0" ) );
+    public string DisplayText
+    {
+      get
+      {
+        return ( string )GetValue( DisplayTextProperty );
+      }
+      set
+      {
+        SetValue( DisplayTextProperty, value );
+      }
+    }
+
+    #endregion //DisplayText
 
-        public static readonly DependencyProperty DisplayTextProperty = DependencyProperty.Register("DisplayText", typeof(string), typeof(CalculatorUpDown), new UIPropertyMetadata("0"));
-        public string DisplayText
-        {
-            get { return (string)GetValue(DisplayTextProperty); }
-            set { SetValue(DisplayTextProperty, value); }
-        }
+    #region EnterClosesCalculator
 
-        #endregion //DisplayText
+    public static readonly DependencyProperty EnterClosesCalculatorProperty = DependencyProperty.Register( "EnterClosesCalculator", typeof( bool ), typeof( CalculatorUpDown ), new UIPropertyMetadata( false ) );
+    public bool EnterClosesCalculator
+    {
+      get
+      {
+        return ( bool )GetValue( EnterClosesCalculatorProperty );
+      }
+      set
+      {
+        SetValue( EnterClosesCalculatorProperty, value );
+      }
+    }
 
-        #region EnterClosesCalculator
+    #endregion //EnterClosesCalculator
 
-        public static readonly DependencyProperty EnterClosesCalculatorProperty = DependencyProperty.Register("EnterClosesCalculator", typeof(bool), typeof(CalculatorUpDown), new UIPropertyMetadata(false));
-        public bool EnterClosesCalculator
-        {
-            get { return (bool)GetValue(EnterClosesCalculatorProperty); }
-            set { SetValue(EnterClosesCalculatorProperty, value); }
-        }
+    #region IsOpen
 
-        #endregion //EnterClosesCalculator
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( CalculatorUpDown ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
 
-        #region IsOpen
+    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      CalculatorUpDown calculatorUpDown = o as CalculatorUpDown;
+      if( calculatorUpDown != null )
+        calculatorUpDown.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
 
-        public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register("IsOpen", typeof(bool), typeof(CalculatorUpDown), new UIPropertyMetadata(false, OnIsOpenChanged));
-        public bool IsOpen
-        {
-            get { return (bool)GetValue(IsOpenProperty); }
-            set { SetValue(IsOpenProperty, value); }
-        }
+    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
+    {
 
-        private static void OnIsOpenChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            CalculatorUpDown calculatorUpDown = o as CalculatorUpDown;
-            if (calculatorUpDown != null)
-                calculatorUpDown.OnIsOpenChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
+    }
 
-        protected virtual void OnIsOpenChanged(bool oldValue, bool newValue)
-        {
+    #endregion //IsOpen
 
-        }
+    #region Memory
 
-        #endregion //IsOpen
+    public static readonly DependencyProperty MemoryProperty = DependencyProperty.Register( "Memory", typeof( decimal ), typeof( CalculatorUpDown ), new UIPropertyMetadata( default( decimal ) ) );
+    public decimal Memory
+    {
+      get
+      {
+        return ( decimal )GetValue( MemoryProperty );
+      }
+      set
+      {
+        SetValue( MemoryProperty, value );
+      }
+    }
 
-        #region Memory
+    #endregion //Memory
 
-        public static readonly DependencyProperty MemoryProperty = DependencyProperty.Register("Memory", typeof(decimal), typeof(CalculatorUpDown), new UIPropertyMetadata(default(decimal)));
-        public decimal Memory
-        {
-            get { return (decimal)GetValue(MemoryProperty); }
-            set { SetValue(MemoryProperty, value); }
-        }
+    #region Precision
 
-        #endregion //Memory
+    public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register( "Precision", typeof( int ), typeof( CalculatorUpDown ), new UIPropertyMetadata( 6 ) );
+    public int Precision
+    {
+      get
+      {
+        return ( int )GetValue( PrecisionProperty );
+      }
+      set
+      {
+        SetValue( PrecisionProperty, value );
+      }
+    }
 
-        #region Precision
+    #endregion //Precision
 
-        public static readonly DependencyProperty PrecisionProperty = DependencyProperty.Register("Precision", typeof(int), typeof(CalculatorUpDown), new UIPropertyMetadata(6));
-        public int Precision
-        {
-            get { return (int)GetValue(PrecisionProperty); }
-            set { SetValue(PrecisionProperty, value); }
-        }
+    #endregion //Properties
 
-        #endregion //Precision
+    #region Constructors
 
-        #endregion //Properties
+    static CalculatorUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( CalculatorUpDown ), new FrameworkPropertyMetadata( typeof( CalculatorUpDown ) ) );
+    }
 
-        #region Constructors
+    public CalculatorUpDown()
+    {
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
 
-        static CalculatorUpDown()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(CalculatorUpDown), new FrameworkPropertyMetadata(typeof(CalculatorUpDown)));
-        }
+    #endregion //Constructors
 
-        public CalculatorUpDown()
-        {
-            Keyboard.AddKeyDownHandler(this, OnKeyDown);
-            Mouse.AddPreviewMouseDownOutsideCapturedElementHandler(this, OnMouseDownOutsideCapturedElement);
-        }
+    #region Base Class Overrides
 
-        #endregion //Constructors
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-        #region Base Class Overrides
+      if( _calculatorPopup != null )
+        _calculatorPopup.Opened -= CalculatorPopup_Opened;
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+      _calculatorPopup = GetTemplateChild( "PART_CalculatorPopup" ) as Popup;
 
-            if (_calculatorPopup != null)
-                _calculatorPopup.Opened -= CalculatorPopup_Opened;
+      if( _calculatorPopup != null )
+        _calculatorPopup.Opened += CalculatorPopup_Opened;
 
-            _calculatorPopup = GetTemplateChild("PART_CalculatorPopup") as Popup;
+      _calculator = GetTemplateChild( "PART_Calculator" ) as Calculator;
+    }
 
-            if (_calculatorPopup != null)
-                _calculatorPopup.Opened += CalculatorPopup_Opened;
+    #endregion //Base Class Overrides
 
-            _calculator = GetTemplateChild("PART_Calculator") as Calculator;
-        }
-
-        #endregion //Base Class Overrides
-
-        #region Event Handlers
-
-        void CalculatorPopup_Opened(object sender, EventArgs e)
-        {
-            _calculator.Focus();
-        }
+    #region Event Handlers
 
-        private void OnKeyDown(object sender, KeyEventArgs e)
-        {
-            switch (e.Key)
-            {
-                case Key.Enter:
-                    {
-                        if (EnterClosesCalculator && IsOpen)
-                            CloseCalculatorUpDown();
-                        break;
-                    }
-                case Key.Escape:
-                    {
-                        CloseCalculatorUpDown();
-                        e.Handled = true;
-                        break;
-                    }
-                case Key.Tab:
-                    {
-                        CloseCalculatorUpDown();
-                        break;
-                    }
-            }
-        }
+    void CalculatorPopup_Opened( object sender, EventArgs e )
+    {
+      _calculator.Focus();
+    }
 
-        private void OnMouseDownOutsideCapturedElement(object sender, MouseButtonEventArgs e)
-        {
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Enter:
+          {
+            if( EnterClosesCalculator && IsOpen )
+              CloseCalculatorUpDown();
+            break;
+          }
+        case Key.Escape:
+          {
+            CloseCalculatorUpDown();
+            e.Handled = true;
+            break;
+          }
+        case Key.Tab:
+          {
             CloseCalculatorUpDown();
-        }
+            break;
+          }
+      }
+    }
 
-        #endregion //Event Handlers
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseCalculatorUpDown();
+    }
 
-        #region Methods
+    #endregion //Event Handlers
 
-        private void CloseCalculatorUpDown()
-        {
-            if (IsOpen)
-                IsOpen = false;
-            ReleaseMouseCapture();
-        }
+    #region Methods
 
-        #endregion //Methods
+    private void CloseCalculatorUpDown()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
index 691f4efc..8e8485fa 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
@@ -1,125 +1,154 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <Style x:Key="CalculatorToggleButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Grid SnapsToDevicePixels="True">
-                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                             CornerRadius="0,2.75,2.75,0"
-                                             RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
-                                             RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
-											 RenderMouseOver="{TemplateBinding IsMouseOver}"
-											 RenderPressed="{TemplateBinding IsPressed}" >
-
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-
-                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
-                                    <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                </Grid>
-                            </Grid>
-                        </chrome:ButtonChrome>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
-    </DataTemplate>
-
-    <!-- =============================================================================== -->
-    <!-- CalculatorUpDown                                                                -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:CalculatorUpDown}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-        <Setter Property="BorderThickness" Value="1,1,0,1" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Right" />
-        <Setter Property="TextAlignment" Value="Right" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:CalculatorUpDown}">
-                    <Grid>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
-                                         AllowSpin="{TemplateBinding AllowSpin}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                                <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0" 
-                                                        Background="Transparent"
-                                                        ContextMenu="{TemplateBinding ContextMenu}"
-                                                        FontFamily="{TemplateBinding FontFamily}" 
-                                                        FontSize="{TemplateBinding FontSize}" 
-                                                        FontStretch="{TemplateBinding FontStretch}"
-                                                        FontStyle="{TemplateBinding FontStyle}" 
-                                                        FontWeight="{TemplateBinding FontWeight}" 
-                                                        Foreground="{TemplateBinding Foreground}" 
-                                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                        IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                                                        MinWidth="20" AcceptsReturn="False" 
-                                                        Padding="0"
-                                                        TextAlignment="{TemplateBinding TextAlignment}"
-                                                        TextWrapping="NoWrap" 
-                                                        TabIndex="{TemplateBinding TabIndex}"
-                                                        Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                                        Watermark="{TemplateBinding Watermark}"
-                                                        WatermarkTemplate="{TemplateBinding WatermarkTemplate}"/>
-                            </local:ButtonSpinner>
-                            <ToggleButton x:Name="_calculatorToggleButton" Grid.Column="1"
-                                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                                          Style="{StaticResource CalculatorToggleButtonStyle}"
-                                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"/>
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="CalculatorToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0,2.75,2.75,0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+											      RenderMouseOver="{TemplateBinding IsMouseOver}"
+											      RenderPressed="{TemplateBinding IsPressed}">
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
                         </Grid>
-                        <Popup x:Name="PART_CalculatorPopup" IsOpen="{Binding IsChecked, ElementName=_calculatorToggleButton}" StaysOpen="False">
-                            <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
-                                <StackPanel>
-                                    <local:Calculator x:Name="PART_Calculator" Background="Transparent" BorderThickness="0"
-                                                      DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
-                                                      Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
-                                                      Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}"
-                                                      Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}" />
-                                </StackPanel>
-                            </Border>
-                        </Popup>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                     </Grid>
+                  </chrome:ButtonChrome>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <!-- =============================================================================== -->
+   <!-- CalculatorUpDown                                                                -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:CalculatorUpDown}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CalculatorUpDown}">
+               <Grid>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                     </Grid.ColumnDefinitions>
+                     <local:ButtonSpinner x:Name="Spinner"
+                                          IsTabStop="False"
+                                          Background="{TemplateBinding Background}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          AllowSpin="{TemplateBinding AllowSpin}"
+                                          ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                        <local:WatermarkTextBox x:Name="TextBox"
+                                                BorderThickness="0" 
+                                                Background="Transparent"
+                                                ContextMenu="{TemplateBinding ContextMenu}"
+                                                FontFamily="{TemplateBinding FontFamily}" 
+                                                FontSize="{TemplateBinding FontSize}" 
+                                                FontStretch="{TemplateBinding FontStretch}"
+                                                FontStyle="{TemplateBinding FontStyle}" 
+                                                FontWeight="{TemplateBinding FontWeight}" 
+                                                Foreground="{TemplateBinding Foreground}" 
+                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                MinWidth="20"
+                                                AcceptsReturn="False"
+                                                Padding="0"
+                                                TextAlignment="{TemplateBinding TextAlignment}"
+                                                TextWrapping="NoWrap" 
+                                                TabIndex="{TemplateBinding TabIndex}"
+                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                Watermark="{TemplateBinding Watermark}"
+                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                     </local:ButtonSpinner>
+                     <ToggleButton x:Name="_calculatorToggleButton"
+                                   Grid.Column="1"
+                                   IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                   Style="{StaticResource CalculatorToggleButtonStyle}"
+                                   IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                  </Grid>
+                  <Popup x:Name="PART_CalculatorPopup"
+                         IsOpen="{Binding IsChecked, ElementName=_calculatorToggleButton}"
+                         StaysOpen="False">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                        <StackPanel>
+                           <local:Calculator x:Name="PART_Calculator"
+                                             Background="Transparent"
+                                             BorderThickness="0"
+                                             DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </StackPanel>
+                     </Border>
+                  </Popup>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs
index ca51b2c6..9082bdc2 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Implementation/CheckComboBox.cs
@@ -1,113 +1,143 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Linq;
 using System.Windows;
-using Microsoft.Windows.Controls.Primitives;
 using System.Windows.Input;
+using Microsoft.Windows.Controls.Primitives;
 
 namespace Microsoft.Windows.Controls
 {
-    public class CheckComboBox : Selector
-    {
-        #region Constructors
+  public class CheckComboBox : Selector
+  {
+    #region Constructors
 
-        static CheckComboBox()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(CheckComboBox), new FrameworkPropertyMetadata(typeof(CheckComboBox)));
-        }
+    static CheckComboBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( CheckComboBox ), new FrameworkPropertyMetadata( typeof( CheckComboBox ) ) );
+    }
 
-        public CheckComboBox()
-        {
-            Mouse.AddPreviewMouseDownOutsideCapturedElementHandler(this, OnMouseDownOutsideCapturedElement);
-        }
+    public CheckComboBox()
+    {
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
 
-        #endregion //Constructors
+    #endregion //Constructors
 
-        #region Properties
+    #region Properties
 
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(CheckComboBox), new UIPropertyMetadata(null));
-        public string Text
-        {
-            get { return (string)GetValue(TextProperty); }
-            set { SetValue(TextProperty, value); }
-        }
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( CheckComboBox ), new UIPropertyMetadata( null ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
 
-        #region IsDropDownOpen
+    #region IsDropDownOpen
 
-        public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register("IsDropDownOpen", typeof(bool), typeof(CheckComboBox), new UIPropertyMetadata(false, OnIsDropDownOpenChanged));
-        public bool IsDropDownOpen
-        {
-            get { return (bool)GetValue(IsDropDownOpenProperty); }
-            set { SetValue(IsDropDownOpenProperty, value); }
-        }
+    public static readonly DependencyProperty IsDropDownOpenProperty = DependencyProperty.Register( "IsDropDownOpen", typeof( bool ), typeof( CheckComboBox ), new UIPropertyMetadata( false, OnIsDropDownOpenChanged ) );
+    public bool IsDropDownOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsDropDownOpenProperty );
+      }
+      set
+      {
+        SetValue( IsDropDownOpenProperty, value );
+      }
+    }
 
-        private static void OnIsDropDownOpenChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            CheckComboBox comboBox = o as CheckComboBox;
-            if (comboBox != null)
-                comboBox.OnIsDropDownOpenChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
+    private static void OnIsDropDownOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      CheckComboBox comboBox = o as CheckComboBox;
+      if( comboBox != null )
+        comboBox.OnIsDropDownOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
 
-        protected virtual void OnIsDropDownOpenChanged(bool oldValue, bool newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
+    protected virtual void OnIsDropDownOpenChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
 
-        #endregion //IsDropDownOpen
+    #endregion //IsDropDownOpen
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region Base Class Overrides
+    #region Base Class Overrides
 
-        protected override void OnSelectedValueChanged(string oldValue, string newValue)
-        {
-            base.OnSelectedValueChanged(oldValue, newValue);
-            UpdateText();
-        }
+    protected override void OnSelectedValueChanged( string oldValue, string newValue )
+    {
+      base.OnSelectedValueChanged( oldValue, newValue );
+      UpdateText();
+    }
 
-        #endregion //Base Class Overrides
+    #endregion //Base Class Overrides
 
-        #region Event Handlers
+    #region Event Handlers
 
-        private void OnMouseDownOutsideCapturedElement(object sender, MouseButtonEventArgs e)
-        {
-            CloseDropDown();
-        }
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseDropDown();
+    }
 
-        #endregion //Event Handlers
+    #endregion //Event Handlers
 
-        #region Methods
+    #region Methods
 
-        private void UpdateText()
-        {
+    private void UpdateText()
+    {
 #if VS2008
-            string newValue = String.Join(Delimiter, SelectedItems.Cast<object>().Select(x => GetItemDisplayValue(x).ToString()).ToArray()); 
+      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemDisplayValue( x ).ToString() ).ToArray() ); 
 #else
-            string newValue = String.Join(Delimiter, SelectedItems.Cast<object>().Select(x => GetItemDisplayValue(x)));
+      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemDisplayValue( x ) ) );
 #endif
 
-            if (String.IsNullOrEmpty(Text) || !Text.Equals(newValue))
-                Text = newValue;
-        }
-
-        protected object GetItemDisplayValue(object item)
-        {
-            if (!String.IsNullOrEmpty(DisplayMemberPath))
-            {
-                var property = item.GetType().GetProperty(DisplayMemberPath);
-                if (property != null)
-                    return property.GetValue(item, null);
-            }
-
-            return item;
-        }
-
-        private void CloseDropDown()
-        {
-            if (IsDropDownOpen)
-                IsDropDownOpen = false;
-            ReleaseMouseCapture();
-        }
-
-        #endregion //Methods
+      if( String.IsNullOrEmpty( Text ) || !Text.Equals( newValue ) )
+        Text = newValue;
+    }
+
+    protected object GetItemDisplayValue( object item )
+    {
+      if( !String.IsNullOrEmpty( DisplayMemberPath ) )
+      {
+        var property = item.GetType().GetProperty( DisplayMemberPath );
+        if( property != null )
+          return property.GetValue( item, null );
+      }
+
+      return item;
+    }
+
+    private void CloseDropDown()
+    {
+      if( IsDropDownOpen )
+        IsDropDownOpen = false;
+      ReleaseMouseCapture();
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml
index df96be29..3f44e6a1 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml
@@ -1,91 +1,109 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
-                    xmlns:primitives="clr-namespace:Microsoft.Windows.Controls.Primitives" >
+                    xmlns:primitives="clr-namespace:Microsoft.Windows.Controls.Primitives">
+
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF707070" />
 
-    <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF707070"/>
+   <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
 
-    <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+   <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+      <Setter Property="OverridesDefaultStyle" Value="true" />
+      <Setter Property="IsTabStop" Value="false" />
+      <Setter Property="Focusable" Value="false" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <chrome:ButtonChrome x:Name="Chrome"
+                                    BorderBrush="{TemplateBinding BorderBrush}" 
+                                    Background="{TemplateBinding Background}"
+                                    CornerRadius="0"
+                                    RenderEnabled="{TemplateBinding IsEnabled}"
+                                    RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
+                                    RenderNormal="False"
+                                    RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}"
+                                    SnapsToDevicePixels="true">
+                  <Grid HorizontalAlignment="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                     <Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="Black" HorizontalAlignment="Center" Margin="3,0,3,0" VerticalAlignment="Center" />
+                  </Grid>
+               </chrome:ButtonChrome>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="RenderPressed" TargetName="Chrome" Value="true" />
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
-    <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="IsTabStop" Value="false"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <chrome:ButtonChrome x:Name="Chrome"
-                                         BorderBrush="{TemplateBinding BorderBrush}" 
-                                         Background="{TemplateBinding Background}"
-                                         CornerRadius="0"
-                                         RenderEnabled="{TemplateBinding IsEnabled}"
-                                         RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
-                                         RenderNormal="False"
-                                         RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}"
-                                         SnapsToDevicePixels="true" >
-                        <Grid HorizontalAlignment="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                            <Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="Black" HorizontalAlignment="Center" Margin="3,0,3,0" VerticalAlignment="Center"/>
-                        </Grid>
-                    </chrome:ButtonChrome>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsChecked" Value="true">
-                            <Setter Property="RenderPressed" TargetName="Chrome" Value="true"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style TargetType="{x:Type local:CheckComboBox}">
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderBrush" Value="{StaticResource ButtonNormalBorder}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="Padding" Value="2" />
+      <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+      <Setter Property="ScrollViewer.PanningMode" Value="Both" />
+      <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
+               <Grid x:Name="MainGrid" SnapsToDevicePixels="true">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="*" />
+                     <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0" />
+                  </Grid.ColumnDefinitions>
+                  <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" StaysOpen="False" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                     <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
+                        <Border x:Name="DropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+                           <ScrollViewer x:Name="DropDownScrollViewer">
+                              <Grid RenderOptions.ClearTypeHint="Enabled">
+                                 <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                    <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
+                                 </Canvas>
+                                 <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                              </Grid>
+                           </ScrollViewer>
+                        </Border>
+                     </Grid>
+                  </Popup>
 
-    <Style TargetType="{x:Type local:CheckComboBox}">
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource ButtonNormalBorder}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="Padding" Value="2"/>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="Both"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
-                    <Grid x:Name="MainGrid" SnapsToDevicePixels="true">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
-                        </Grid.ColumnDefinitions>
-                        <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" StaysOpen="False" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-                            <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
-                                <Border x:Name="DropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
-                                    <ScrollViewer x:Name="DropDownScrollViewer">
-                                        <Grid RenderOptions.ClearTypeHint="Enabled">
-                                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
-                                                <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}"/>
-                                            </Canvas>
-                                            <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                        </Grid>
-                                    </ScrollViewer>
-                                </Border>
-                            </Grid>
-                        </Popup>
-                        
-                        <Border Grid.ColumnSpan="2" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
-                        <TextBox Text="{TemplateBinding Text}" IsReadOnly="True" BorderThickness="0" Background="Transparent" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                        <ToggleButton x:Name="PART_DropDownButton" Grid.Column="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"
-                                      IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"/>                        
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                  <Border Grid.ColumnSpan="2" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+                  <TextBox Text="{TemplateBinding Text}" IsReadOnly="True" BorderThickness="0" Background="Transparent" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+                  <ToggleButton x:Name="PART_DropDownButton" Grid.Column="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"
+                                IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs
index 9b74466e..3378cf39 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Implementation/CheckListBox.cs
@@ -1,22 +1,40 @@
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Windows;
 using Microsoft.Windows.Controls.Primitives;
 
 namespace Microsoft.Windows.Controls
 {
-    public class CheckListBox : Selector
-    {
-        #region Constructors
-
-        static CheckListBox()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(CheckListBox), new FrameworkPropertyMetadata(typeof(CheckListBox)));
-        }
+  public class CheckListBox : Selector
+  {
+    #region Constructors
 
-        public CheckListBox()
-        {
+    static CheckListBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( CheckListBox ), new FrameworkPropertyMetadata( typeof( CheckListBox ) ) );
+    }
 
-        }
+    public CheckListBox()
+    {
 
-        #endregion //Constructors
     }
+
+    #endregion //Constructors
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml
index 7706806b..614874e2 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml
@@ -1,26 +1,44 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
-    
-    <Style TargetType="{x:Type local:CheckListBox}">
-        <Setter Property="BorderBrush" Value="#FF707070" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="KeyboardNavigation.TabNavigation" Value="Once"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:CheckListBox}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <ScrollViewer  Padding="{TemplateBinding Padding}"  VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
-                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+
+   <Style TargetType="{x:Type local:CheckListBox}">
+      <Setter Property="BorderBrush" Value="#FF707070" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CheckListBox}">
+               <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <ScrollViewer Padding="{TemplateBinding Padding}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+                     <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </ScrollViewer>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs
index 527cc0d8..2264211d 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/ChildWindow.cs
@@ -1,755 +1,892 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using System.Windows.Input;
 using System.Windows.Media;
-using System.Windows.Controls.Primitives;
-using System.ComponentModel;
 using System.Windows.Shapes;
 using System.Windows.Threading;
 
 namespace Microsoft.Windows.Controls
 {
-    public class ChildWindow : ContentControl
-    {
-        #region Private Members
+  public class ChildWindow : ContentControl
+  {
+    #region Private Members
 
-        private Grid _root;
-        private TranslateTransform _moveTransform = new TranslateTransform();
-        private bool _startupPositionInitialized;
-        private bool _isMouseCaptured;
-        private Point _clickPoint;
-        private Point _oldPosition;
-        private Border _dragWidget;
-        private FrameworkElement _parentContainer;
-        private Rectangle _modalLayer = new Rectangle();
-        private Canvas _modalLayerPanel = new Canvas();
+    private Grid _root;
+    private TranslateTransform _moveTransform = new TranslateTransform();
+    private bool _startupPositionInitialized;
+    private bool _isMouseCaptured;
+    private Point _clickPoint;
+    private Point _oldPosition;
+    private Border _dragWidget;
+    private FrameworkElement _parentContainer;
+    private Rectangle _modalLayer = new Rectangle();
+    private Canvas _modalLayerPanel = new Canvas();
 
-        private const int _horizaontalOffset = 3;
-        private const int _verticalOffset = 3;
+    private const int _horizaontalOffset = 3;
+    private const int _verticalOffset = 3;
 
-        bool _ignorePropertyChanged;
+    bool _ignorePropertyChanged;
 
-        #endregion //Private Members
+    #endregion //Private Members
 
-        #region Properties
+    #region Properties
 
-        #region Internal Properties
+    #region Internal Properties
 
-        internal Grid WindowRoot { get; private set; }
-        internal Thumb DragWidget { get; private set; }
-        internal Button MinimizeButton { get; private set; }
-        internal Button MaximizeButton { get; private set; }
-        internal Button CloseButton { get; private set; }
+    internal Grid WindowRoot
+    {
+      get;
+      private set;
+    }
+    internal Thumb DragWidget
+    {
+      get;
+      private set;
+    }
+    internal Button MinimizeButton
+    {
+      get;
+      private set;
+    }
+    internal Button MaximizeButton
+    {
+      get;
+      private set;
+    }
+    internal Button CloseButton
+    {
+      get;
+      private set;
+    }
 
-        #endregion //Internal Properties
+    #endregion //Internal Properties
 
-        #region Public Properties
+    #region Public Properties
 
-        #region Caption
+    #region Caption
 
-        public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register("Caption", typeof(object), typeof(ChildWindow), new UIPropertyMetadata(String.Empty));
-        public object Caption
-        {
-            get { return (object)GetValue(CaptionProperty); }
-            set { SetValue(CaptionProperty, value); }
-        }
+    public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register( "Caption", typeof( object ), typeof( ChildWindow ), new UIPropertyMetadata( String.Empty ) );
+    public object Caption
+    {
+      get
+      {
+        return ( object )GetValue( CaptionProperty );
+      }
+      set
+      {
+        SetValue( CaptionProperty, value );
+      }
+    }
 
-        #endregion //Caption
+    #endregion //Caption
 
-        #region CaptionForeground
+    #region CaptionForeground
 
-        public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register("CaptionForeground", typeof(Brush), typeof(ChildWindow), new UIPropertyMetadata(null));
-        public Brush CaptionForeground
-        {
-            get { return (Brush)GetValue(CaptionForegroundProperty); }
-            set { SetValue(CaptionForegroundProperty, value); }
-        }
+    public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register( "CaptionForeground", typeof( Brush ), typeof( ChildWindow ), new UIPropertyMetadata( null ) );
+    public Brush CaptionForeground
+    {
+      get
+      {
+        return ( Brush )GetValue( CaptionForegroundProperty );
+      }
+      set
+      {
+        SetValue( CaptionForegroundProperty, value );
+      }
+    }
 
-        #endregion //CaptionForeground
+    #endregion //CaptionForeground
 
-        #region CloseButtonStyle
+    #region CloseButtonStyle
 
-        public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register("CloseButtonStyle", typeof(Style), typeof(ChildWindow), new PropertyMetadata(null));
-        public Style CloseButtonStyle
-        {
-            get { return (Style)GetValue(CloseButtonStyleProperty); }
-            set { SetValue(CloseButtonStyleProperty, value); }
-        }
+    public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( ChildWindow ), new PropertyMetadata( null ) );
+    public Style CloseButtonStyle
+    {
+      get
+      {
+        return ( Style )GetValue( CloseButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonStyleProperty, value );
+      }
+    }
 
-        #endregion //CloseButtonStyle
+    #endregion //CloseButtonStyle
 
-        #region CloseButtonVisibility
+    #region CloseButtonVisibility
 
-        public static readonly DependencyProperty CloseButtonVisibilityProperty = DependencyProperty.Register("CloseButtonVisibility", typeof(Visibility), typeof(ChildWindow), new PropertyMetadata(Visibility.Visible));
-        public Visibility CloseButtonVisibility
-        {
-            get { return (Visibility)GetValue(CloseButtonVisibilityProperty); }
-            set { SetValue(CloseButtonVisibilityProperty, value); }
-        }
+    public static readonly DependencyProperty CloseButtonVisibilityProperty = DependencyProperty.Register( "CloseButtonVisibility", typeof( Visibility ), typeof( ChildWindow ), new PropertyMetadata( Visibility.Visible ) );
+    public Visibility CloseButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( CloseButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonVisibilityProperty, value );
+      }
+    }
 
-        #endregion //CloseButtonVisibility
+    #endregion //CloseButtonVisibility
 
-        #region DialogResult
+    #region DialogResult
 
-        private bool? _dialogResult;
-        /// <summary>
-        /// Gets or sets a value indicating whether the ChildWindow was accepted or canceled.
-        /// </summary>
-        /// <value>
-        /// True if the child window was accepted; false if the child window was
-        /// canceled. The default is null.
-        /// </value>
-        [TypeConverter(typeof(NullableBoolConverter))]
-        public bool? DialogResult
-        {
-            get { return _dialogResult; }
-            set
-            {
-                if (_dialogResult != value)
-                {
-                    _dialogResult = value;
-                    Close();
-                }
-            }
-        }
+    private bool? _dialogResult;
+    /// <summary>
+    /// Gets or sets a value indicating whether the ChildWindow was accepted or canceled.
+    /// </summary>
+    /// <value>
+    /// True if the child window was accepted; false if the child window was
+    /// canceled. The default is null.
+    /// </value>
+    [TypeConverter( typeof( NullableBoolConverter ) )]
+    public bool? DialogResult
+    {
+      get
+      {
+        return _dialogResult;
+      }
+      set
+      {
+        if( _dialogResult != value )
+        {
+          _dialogResult = value;
+          Close();
+        }
+      }
+    }
 
-        #endregion //DialogResult
+    #endregion //DialogResult
 
-        #region DesignerWindowState
+    #region DesignerWindowState
 
-        public static readonly DependencyProperty DesignerWindowStateProperty = DependencyProperty.Register("DesignerWindowState", typeof(WindowState), typeof(ChildWindow), new PropertyMetadata(WindowState.Closed, OnDesignerWindowStatePropertyChanged));
-        public WindowState DesignerWindowState
-        {
-            get { return (WindowState)GetValue(DesignerWindowStateProperty); }
-            set { SetValue(DesignerWindowStateProperty, value); }
-        }
+    public static readonly DependencyProperty DesignerWindowStateProperty = DependencyProperty.Register( "DesignerWindowState", typeof( WindowState ), typeof( ChildWindow ), new PropertyMetadata( WindowState.Closed, OnDesignerWindowStatePropertyChanged ) );
+    public WindowState DesignerWindowState
+    {
+      get
+      {
+        return ( WindowState )GetValue( DesignerWindowStateProperty );
+      }
+      set
+      {
+        SetValue( DesignerWindowStateProperty, value );
+      }
+    }
 
-        private static void OnDesignerWindowStatePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ChildWindow childWindow = d as ChildWindow;
-            if (childWindow != null)
-                childWindow.OnDesignerWindowStatePropertyChanged((WindowState)e.OldValue, (WindowState)e.NewValue);
-        }
+    private static void OnDesignerWindowStatePropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnDesignerWindowStatePropertyChanged( ( WindowState )e.OldValue, ( WindowState )e.NewValue );
+    }
 
-        protected virtual void OnDesignerWindowStatePropertyChanged(WindowState oldValue, WindowState newValue)
-        {
-            if (DesignerProperties.GetIsInDesignMode(this))
-            {
-                Visibility = newValue == Controls.WindowState.Open ? Visibility.Visible : Visibility.Collapsed;
-            }
-        }
+    protected virtual void OnDesignerWindowStatePropertyChanged( WindowState oldValue, WindowState newValue )
+    {
+      if( DesignerProperties.GetIsInDesignMode( this ) )
+      {
+        Visibility = newValue == Controls.WindowState.Open ? Visibility.Visible : Visibility.Collapsed;
+      }
+    }
 
-        #endregion //DesignerWindowState
+    #endregion //DesignerWindowState
 
-        #region FocusedElement
+    #region FocusedElement
 
-        public static readonly DependencyProperty FocusedElementProperty = DependencyProperty.Register("FocusedElement", typeof(FrameworkElement), typeof(ChildWindow), new UIPropertyMetadata(null));
-        public FrameworkElement FocusedElement
-        {
-            get { return (FrameworkElement)GetValue(FocusedElementProperty); }
-            set { SetValue(FocusedElementProperty, value); }
-        }
+    public static readonly DependencyProperty FocusedElementProperty = DependencyProperty.Register( "FocusedElement", typeof( FrameworkElement ), typeof( ChildWindow ), new UIPropertyMetadata( null ) );
+    public FrameworkElement FocusedElement
+    {
+      get
+      {
+        return ( FrameworkElement )GetValue( FocusedElementProperty );
+      }
+      set
+      {
+        SetValue( FocusedElementProperty, value );
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region IsModal
+    #region IsModal
 
-        public static readonly DependencyProperty IsModalProperty = DependencyProperty.Register("IsModal", typeof(bool), typeof(ChildWindow), new UIPropertyMetadata(false, new PropertyChangedCallback(OnIsModalPropertyChanged)));
-        public bool IsModal
-        {
-            get { return (bool)GetValue(IsModalProperty); }
-            set { SetValue(IsModalProperty, value); }
-        }
+    public static readonly DependencyProperty IsModalProperty = DependencyProperty.Register( "IsModal", typeof( bool ), typeof( ChildWindow ), new UIPropertyMetadata( false, new PropertyChangedCallback( OnIsModalPropertyChanged ) ) );
+    public bool IsModal
+    {
+      get
+      {
+        return ( bool )GetValue( IsModalProperty );
+      }
+      set
+      {
+        SetValue( IsModalProperty, value );
+      }
+    }
 
-        private static void OnIsModalPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ChildWindow childWindow = d as ChildWindow;
-            if (childWindow != null)
-                childWindow.OnIsModalChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
+    private static void OnIsModalPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnIsModalChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
 
-        private void OnIsModalChanged(bool oldValue, bool newValue)
-        {
-            if (newValue)
-            {
-                KeyboardNavigation.SetTabNavigation(this, KeyboardNavigationMode.Cycle);
-                ShowModalLayer();
-            }
-            else
-            {
-                KeyboardNavigation.SetTabNavigation(this, KeyboardNavigationMode.Continue);
-                HideModalLayer();
-            }
-        }
+    private void OnIsModalChanged( bool oldValue, bool newValue )
+    {
+      if( newValue )
+      {
+        KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Cycle );
+        ShowModalLayer();
+      }
+      else
+      {
+        KeyboardNavigation.SetTabNavigation( this, KeyboardNavigationMode.Continue );
+        HideModalLayer();
+      }
+    }
 
-        #endregion //IsModal
+    #endregion //IsModal
 
-        #region Left
+    #region Left
 
-        public static readonly DependencyProperty LeftProperty = DependencyProperty.Register("Left", typeof(double), typeof(ChildWindow), new PropertyMetadata(0.0, new PropertyChangedCallback(OnLeftPropertyChanged)));
-        public double Left
-        {
-            get { return (double)GetValue(LeftProperty); }
-            set { SetValue(LeftProperty, value); }
-        }
+    public static readonly DependencyProperty LeftProperty = DependencyProperty.Register( "Left", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnLeftPropertyChanged ) ) );
+    public double Left
+    {
+      get
+      {
+        return ( double )GetValue( LeftProperty );
+      }
+      set
+      {
+        SetValue( LeftProperty, value );
+      }
+    }
 
-        private static void OnLeftPropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e)
-        {
-            ChildWindow childWindow = obj as ChildWindow;
-            if (childWindow != null)
-                childWindow.OnLeftPropertyChanged((double)e.OldValue, (double)e.NewValue);
-        }
+    private static void OnLeftPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = obj as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnLeftPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
 
-        private void OnLeftPropertyChanged(double oldValue, double newValue)
-        {
-            Left = GetRestrictedLeft();
-            ProcessMove(newValue - oldValue, 0);
-        }
+    private void OnLeftPropertyChanged( double oldValue, double newValue )
+    {
+      Left = GetRestrictedLeft();
+      ProcessMove( newValue - oldValue, 0 );
+    }
 
-        #endregion //Left
+    #endregion //Left
 
-        #region OverlayBrush
+    #region OverlayBrush
 
-        public static readonly DependencyProperty OverlayBrushProperty = DependencyProperty.Register("OverlayBrush", typeof(Brush), typeof(ChildWindow), new PropertyMetadata(Brushes.Gray, OnOverlayBrushChanged));
-        public Brush OverlayBrush
-        {
-            get { return (Brush)GetValue(OverlayBrushProperty); }
-            set { SetValue(OverlayBrushProperty, value); }
-        }
+    public static readonly DependencyProperty OverlayBrushProperty = DependencyProperty.Register( "OverlayBrush", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( Brushes.Gray, OnOverlayBrushChanged ) );
+    public Brush OverlayBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( OverlayBrushProperty );
+      }
+      set
+      {
+        SetValue( OverlayBrushProperty, value );
+      }
+    }
 
-        private static void OnOverlayBrushChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ChildWindow childWindow = d as ChildWindow;
-            if (childWindow != null)
-                childWindow.OnOverlayBrushChanged((Brush)e.OldValue, (Brush)e.NewValue);
-        }
+    private static void OnOverlayBrushChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnOverlayBrushChanged( ( Brush )e.OldValue, ( Brush )e.NewValue );
+    }
 
-        protected virtual void OnOverlayBrushChanged(Brush oldValue, Brush newValue)
-        {
-            _modalLayer.Fill = newValue;
-        }
+    protected virtual void OnOverlayBrushChanged( Brush oldValue, Brush newValue )
+    {
+      _modalLayer.Fill = newValue;
+    }
 
-        #endregion //OverlayBrush
+    #endregion //OverlayBrush
 
-        #region OverlayOpacity
+    #region OverlayOpacity
 
-        public static readonly DependencyProperty OverlayOpacityProperty = DependencyProperty.Register("OverlayOpacity", typeof(double), typeof(ChildWindow), new PropertyMetadata(0.5, OnOverlayOpacityChanged));
-        public double OverlayOpacity
-        {
-            get { return (double)GetValue(OverlayOpacityProperty); }
-            set { SetValue(OverlayOpacityProperty, value); }
-        }
+    public static readonly DependencyProperty OverlayOpacityProperty = DependencyProperty.Register( "OverlayOpacity", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.5, OnOverlayOpacityChanged ) );
+    public double OverlayOpacity
+    {
+      get
+      {
+        return ( double )GetValue( OverlayOpacityProperty );
+      }
+      set
+      {
+        SetValue( OverlayOpacityProperty, value );
+      }
+    }
 
-        private static void OnOverlayOpacityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ChildWindow childWindow = d as ChildWindow;
-            if (childWindow != null)
-                childWindow.OnOverlayOpacityChanged((double)e.OldValue, (double)e.NewValue);
-        }
+    private static void OnOverlayOpacityChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnOverlayOpacityChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
 
-        protected virtual void OnOverlayOpacityChanged(double oldValue, double newValue)
-        {
-            _modalLayer.Opacity = newValue;
-        }
+    protected virtual void OnOverlayOpacityChanged( double oldValue, double newValue )
+    {
+      _modalLayer.Opacity = newValue;
+    }
 
-        #endregion //OverlayOpacity
+    #endregion //OverlayOpacity
 
-        #region Top
+    #region Top
 
-        public static readonly DependencyProperty TopProperty = DependencyProperty.Register("Top", typeof(double), typeof(ChildWindow), new PropertyMetadata(0.0, new PropertyChangedCallback(OnTopPropertyChanged)));
-        public double Top
-        {
-            get { return (double)GetValue(TopProperty); }
-            set { SetValue(TopProperty, value); }
-        }
+    public static readonly DependencyProperty TopProperty = DependencyProperty.Register( "Top", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( 0.0, new PropertyChangedCallback( OnTopPropertyChanged ) ) );
+    public double Top
+    {
+      get
+      {
+        return ( double )GetValue( TopProperty );
+      }
+      set
+      {
+        SetValue( TopProperty, value );
+      }
+    }
 
-        private static void OnTopPropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e)
-        {
-            ChildWindow childWindow = obj as ChildWindow;
-            if (childWindow != null)
-                childWindow.OnTopPropertyChanged((double)e.OldValue, (double)e.NewValue);
-        }
+    private static void OnTopPropertyChanged( DependencyObject obj, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = obj as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnTopPropertyChanged( ( double )e.OldValue, ( double )e.NewValue );
+    }
 
-        private void OnTopPropertyChanged(double oldValue, double newValue)
-        {
-            Top = GetRestrictedTop();
-            ProcessMove(0, newValue - oldValue);
-        }
+    private void OnTopPropertyChanged( double oldValue, double newValue )
+    {
+      Top = GetRestrictedTop();
+      ProcessMove( 0, newValue - oldValue );
+    }
 
-        #endregion //TopProperty
+    #endregion //TopProperty
 
-        #region WindowBackground
+    #region WindowBackground
 
-        public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register("WindowBackground", typeof(Brush), typeof(ChildWindow), new PropertyMetadata(null));
-        public Brush WindowBackground
-        {
-            get { return (Brush)GetValue(WindowBackgroundProperty); }
-            set { SetValue(WindowBackgroundProperty, value); }
-        }
+    public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( null ) );
+    public Brush WindowBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WindowBackgroundProperty, value );
+      }
+    }
 
-        #endregion //WindowBackground
+    #endregion //WindowBackground
 
-        #region WindowBorderBrush
+    #region WindowBorderBrush
 
-        public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register("WindowBorderBrush", typeof(Brush), typeof(ChildWindow), new PropertyMetadata(null));
-        public Brush WindowBorderBrush
-        {
-            get { return (Brush)GetValue(WindowBorderBrushProperty); }
-            set { SetValue(WindowBorderBrushProperty, value); }
-        }
+    public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( ChildWindow ), new PropertyMetadata( null ) );
+    public Brush WindowBorderBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBorderBrushProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderBrushProperty, value );
+      }
+    }
 
-        #endregion //WindowBorderBrush
+    #endregion //WindowBorderBrush
 
-        #region WindowOpacity
+    #region WindowOpacity
 
-        public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register("WindowOpacity", typeof(double), typeof(ChildWindow), new PropertyMetadata(null));
-        public double WindowOpacity
-        {
-            get { return (double)GetValue(WindowOpacityProperty); }
-            set { SetValue(WindowOpacityProperty, value); }
-        }
+    public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( ChildWindow ), new PropertyMetadata( null ) );
+    public double WindowOpacity
+    {
+      get
+      {
+        return ( double )GetValue( WindowOpacityProperty );
+      }
+      set
+      {
+        SetValue( WindowOpacityProperty, value );
+      }
+    }
 
-        #endregion //WindowOpacity
+    #endregion //WindowOpacity
 
-        #region WindowStartupLocation
+    #region WindowStartupLocation
 
-        public static readonly DependencyProperty WindowStartupLocationProperty = DependencyProperty.Register("WindowStartupLocation", typeof(WindowStartupLocation), typeof(ChildWindow), new UIPropertyMetadata(WindowStartupLocation.Manual, OnWindowStartupLocationChanged));
-        public WindowStartupLocation WindowStartupLocation
-        {
-            get { return (WindowStartupLocation)GetValue(WindowStartupLocationProperty); }
-            set { SetValue(WindowStartupLocationProperty, value); }
-        }
+    public static readonly DependencyProperty WindowStartupLocationProperty = DependencyProperty.Register( "WindowStartupLocation", typeof( WindowStartupLocation ), typeof( ChildWindow ), new UIPropertyMetadata( WindowStartupLocation.Manual, OnWindowStartupLocationChanged ) );
+    public WindowStartupLocation WindowStartupLocation
+    {
+      get
+      {
+        return ( WindowStartupLocation )GetValue( WindowStartupLocationProperty );
+      }
+      set
+      {
+        SetValue( WindowStartupLocationProperty, value );
+      }
+    }
 
-        private static void OnWindowStartupLocationChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ChildWindow childWindow = o as ChildWindow;
-            if (childWindow != null)
-                childWindow.OnWindowStartupLocationChanged((WindowStartupLocation)e.OldValue, (WindowStartupLocation)e.NewValue);
-        }
+    private static void OnWindowStartupLocationChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = o as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnWindowStartupLocationChanged( ( WindowStartupLocation )e.OldValue, ( WindowStartupLocation )e.NewValue );
+    }
 
-        protected virtual void OnWindowStartupLocationChanged(WindowStartupLocation oldValue, WindowStartupLocation newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
+    protected virtual void OnWindowStartupLocationChanged( WindowStartupLocation oldValue, WindowStartupLocation newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
 
-        #endregion //WindowStartupLocation
+    #endregion //WindowStartupLocation
 
-        #region WindowState
+    #region WindowState
 
-        public static readonly DependencyProperty WindowStateProperty = DependencyProperty.Register("WindowState", typeof(WindowState), typeof(ChildWindow), new FrameworkPropertyMetadata(WindowState.Closed, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnWindowStatePropertyChanged));
-        public WindowState WindowState
-        {
-            get { return (WindowState)GetValue(WindowStateProperty); }
-            set { SetValue(WindowStateProperty, value); }
-        }
+    public static readonly DependencyProperty WindowStateProperty = DependencyProperty.Register( "WindowState", typeof( WindowState ), typeof( ChildWindow ), new FrameworkPropertyMetadata( WindowState.Closed, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnWindowStatePropertyChanged ) );
+    public WindowState WindowState
+    {
+      get
+      {
+        return ( WindowState )GetValue( WindowStateProperty );
+      }
+      set
+      {
+        SetValue( WindowStateProperty, value );
+      }
+    }
 
-        private static void OnWindowStatePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ChildWindow childWindow = d as ChildWindow;
-            if (childWindow != null)
-                childWindow.OnWindowStatePropertyChanged((WindowState)e.OldValue, (WindowState)e.NewValue);
-        }
+    private static void OnWindowStatePropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ChildWindow childWindow = d as ChildWindow;
+      if( childWindow != null )
+        childWindow.OnWindowStatePropertyChanged( ( WindowState )e.OldValue, ( WindowState )e.NewValue );
+    }
 
-        protected virtual void OnWindowStatePropertyChanged(WindowState oldValue, WindowState newValue)
-        {
-            if (!DesignerProperties.GetIsInDesignMode(this))
-            {
-                if (!_ignorePropertyChanged)
-                    SetWindowState(newValue);
-            }
-            else
-            {
-                Visibility = DesignerWindowState == Controls.WindowState.Open ? Visibility.Visible : System.Windows.Visibility.Collapsed;
-            }
-        }
+    protected virtual void OnWindowStatePropertyChanged( WindowState oldValue, WindowState newValue )
+    {
+      if( !DesignerProperties.GetIsInDesignMode( this ) )
+      {
+        if( !_ignorePropertyChanged )
+          SetWindowState( newValue );
+      }
+      else
+      {
+        Visibility = DesignerWindowState == Controls.WindowState.Open ? Visibility.Visible : System.Windows.Visibility.Collapsed;
+      }
+    }
 
-        #endregion //WindowState
+    #endregion //WindowState
 
-        #endregion //Public Properties
+    #endregion //Public Properties
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region Constructors
+    #region Constructors
 
-        static ChildWindow()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(ChildWindow), new FrameworkPropertyMetadata(typeof(ChildWindow)));
-        }
+    static ChildWindow()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ChildWindow ), new FrameworkPropertyMetadata( typeof( ChildWindow ) ) );
+    }
 
-        public ChildWindow()
-        {
-            DesignerWindowState = Controls.WindowState.Open;
+    public ChildWindow()
+    {
+      DesignerWindowState = Controls.WindowState.Open;
 
-            IsVisibleChanged += ChildWindow_IsVisibleChanged;
+      IsVisibleChanged += ChildWindow_IsVisibleChanged;
 
-            _modalLayer.Fill = OverlayBrush;
-            _modalLayer.Opacity = OverlayOpacity;
-        }
+      _modalLayer.Fill = OverlayBrush;
+      _modalLayer.Opacity = OverlayOpacity;
+    }
 
-        #endregion //Constructors
+    #endregion //Constructors
 
-        #region Base Class Overrides
+    #region Base Class Overrides
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-            if (_dragWidget != null)
-            {
-                _dragWidget.RemoveHandler(UIElement.MouseLeftButtonDownEvent, new MouseButtonEventHandler(HeaderLeftMouseButtonDown));
-                _dragWidget.RemoveHandler(UIElement.MouseLeftButtonUpEvent, new MouseButtonEventHandler(HeaderMouseLeftButtonUp));
-                _dragWidget.MouseMove -= (o, e) => HeaderMouseMove(e);
-            }
+      if( _dragWidget != null )
+      {
+        _dragWidget.RemoveHandler( UIElement.MouseLeftButtonDownEvent, new MouseButtonEventHandler( HeaderLeftMouseButtonDown ) );
+        _dragWidget.RemoveHandler( UIElement.MouseLeftButtonUpEvent, new MouseButtonEventHandler( HeaderMouseLeftButtonUp ) );
+        _dragWidget.MouseMove -= ( o, e ) => HeaderMouseMove( e );
+      }
 
-            _dragWidget = GetTemplateChild("PART_DragWidget") as Border;
+      _dragWidget = GetTemplateChild( "PART_DragWidget" ) as Border;
 
-            if (_dragWidget != null)
-            {
-                _dragWidget.AddHandler(UIElement.MouseLeftButtonDownEvent, new MouseButtonEventHandler(HeaderLeftMouseButtonDown), true);
-                _dragWidget.AddHandler(UIElement.MouseLeftButtonUpEvent, new MouseButtonEventHandler(HeaderMouseLeftButtonUp), true);
-                _dragWidget.MouseMove += (o, e) => HeaderMouseMove(e);
-            }
+      if( _dragWidget != null )
+      {
+        _dragWidget.AddHandler( UIElement.MouseLeftButtonDownEvent, new MouseButtonEventHandler( HeaderLeftMouseButtonDown ), true );
+        _dragWidget.AddHandler( UIElement.MouseLeftButtonUpEvent, new MouseButtonEventHandler( HeaderMouseLeftButtonUp ), true );
+        _dragWidget.MouseMove += ( o, e ) => HeaderMouseMove( e );
+      }
 
-            if (CloseButton != null)
-                CloseButton.Click -= (o, e) => Close();
+      if( CloseButton != null )
+        CloseButton.Click -= ( o, e ) => Close();
 
-            CloseButton = GetTemplateChild("PART_CloseButton") as Button;
+      CloseButton = GetTemplateChild( "PART_CloseButton" ) as Button;
 
-            if (CloseButton != null)
-                CloseButton.Click += (o, e) => Close();
+      if( CloseButton != null )
+        CloseButton.Click += ( o, e ) => Close();
 
-            WindowRoot = GetTemplateChild("PART_WindowRoot") as Grid;
-            WindowRoot.RenderTransform = _moveTransform;
+      WindowRoot = GetTemplateChild( "PART_WindowRoot" ) as Grid;
+      WindowRoot.RenderTransform = _moveTransform;
 
-            _parentContainer = VisualTreeHelper.GetParent(this) as FrameworkElement;
-            _parentContainer.LayoutUpdated += ParentContainer_LayoutUpdated;
-            _parentContainer.SizeChanged += ParentContainer_SizeChanged;
+      _parentContainer = VisualTreeHelper.GetParent( this ) as FrameworkElement;
+      _parentContainer.LayoutUpdated += ParentContainer_LayoutUpdated;
+      _parentContainer.SizeChanged += ParentContainer_SizeChanged;
 
-            //initialize our modal background width/height
-            _modalLayer.Height = _parentContainer.ActualHeight;
-            _modalLayer.Width = _parentContainer.ActualWidth;
+      //initialize our modal background width/height
+      _modalLayer.Height = _parentContainer.ActualHeight;
+      _modalLayer.Width = _parentContainer.ActualWidth;
 
-            //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore
-            //we need to handle the loaded event and reposition the window.
-            if (System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted)
+      //this is for XBAP applications only. When inside an XBAP the parent container has no height or width until it has loaded. Therefore
+      //we need to handle the loaded event and reposition the window.
+      if( System.Windows.Interop.BrowserInteropHelper.IsBrowserHosted )
+      {
+        _parentContainer.Loaded += ( o, e ) =>
             {
-                _parentContainer.Loaded += (o, e) =>
-                    {
-                        ExecuteOpen();
-                    };
-            }
+              ExecuteOpen();
+            };
+      }
 
-            _root = GetTemplateChild("Root") as Grid;
+      _root = GetTemplateChild( "Root" ) as Grid;
 
 #if VS2008
-            FocusVisualStyle = null;
+      FocusVisualStyle = null;
 #else
-            Style focusStyle = _root.Resources["FocusVisualStyle"] as Style;
-            if (focusStyle != null)
-            {
-                Setter focusStyleDataContext = new Setter(Control.DataContextProperty, this);
-                focusStyle.Setters.Add(focusStyleDataContext);
-                FocusVisualStyle = focusStyle;
-            }
+      Style focusStyle = _root.Resources[ "FocusVisualStyle" ] as Style;
+      if( focusStyle != null )
+      {
+        Setter focusStyleDataContext = new Setter( Control.DataContextProperty, this );
+        focusStyle.Setters.Add( focusStyleDataContext );
+        FocusVisualStyle = focusStyle;
+      }
 #endif
-            _root.Children.Add(_modalLayerPanel);
-        }
-
-        protected override void OnGotFocus(RoutedEventArgs e)
-        {
-            Action action = () =>
-            {
-                if (FocusedElement != null)
-                    FocusedElement.Focus();
-            };
-
-            Dispatcher.BeginInvoke(DispatcherPriority.ApplicationIdle, action);
-        }
-
-        protected override void OnKeyDown(KeyEventArgs e)
-        {
-            base.OnKeyDown(e);
+      _root.Children.Add( _modalLayerPanel );
+    }
 
-            if (WindowState == WindowState.Open)
-            {
-                switch (e.Key)
-                {
-                    case Key.Left:
-                        this.Left -= _horizaontalOffset;
-                        e.Handled = true;
-                        break;
-
-                    case Key.Right:
-                        this.Left += _horizaontalOffset;
-                        e.Handled = true;
-                        break;
-
-                    case Key.Down:
-                        this.Top += _verticalOffset;
-                        e.Handled = true;
-                        break;
-
-                    case Key.Up:
-                        this.Top -= _verticalOffset;
-                        e.Handled = true;
-                        break;
-                }
-            }
-        }
+    protected override void OnGotFocus( RoutedEventArgs e )
+    {
+      Action action = () =>
+      {
+        if( FocusedElement != null )
+          FocusedElement.Focus();
+      };
 
-        #endregion //Base Class Overrides
+      Dispatcher.BeginInvoke( DispatcherPriority.ApplicationIdle, action );
+    }
 
-        #region Event Handlers
+    protected override void OnKeyDown( KeyEventArgs e )
+    {
+      base.OnKeyDown( e );
 
-        void ChildWindow_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
+      if( WindowState == WindowState.Open )
+      {
+        switch( e.Key )
         {
-            if ((bool)e.NewValue)
-                Focus();
-        }
+          case Key.Left:
+            this.Left -= _horizaontalOffset;
+            e.Handled = true;
+            break;
 
-        void HeaderLeftMouseButtonDown(object sender, MouseButtonEventArgs e)
-        {
+          case Key.Right:
+            this.Left += _horizaontalOffset;
             e.Handled = true;
-            Focus();
-            _dragWidget.CaptureMouse();
-            _isMouseCaptured = true;
-            _clickPoint = e.GetPosition(null); //save off the mouse position
-            _oldPosition = new Point(Left, Top); //save off our original window position
-        }
+            break;
 
-        private void HeaderMouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
+          case Key.Down:
+            this.Top += _verticalOffset;
+            e.Handled = true;
+            break;
+
+          case Key.Up:
+            this.Top -= _verticalOffset;
             e.Handled = true;
-            _dragWidget.ReleaseMouseCapture();
-            _isMouseCaptured = false;
+            break;
         }
+      }
+    }
 
-        private void HeaderMouseMove(MouseEventArgs e)
-        {
-            if (_isMouseCaptured && Visibility == Visibility.Visible)
-            {
-                Point currentPosition = e.GetPosition(null); //our current mouse position
+    #endregion //Base Class Overrides
 
-                Left = _oldPosition.X + (currentPosition.X - _clickPoint.X);
-                Top = _oldPosition.Y + (currentPosition.Y - _clickPoint.Y);
+    #region Event Handlers
 
-                //this helps keep our mouse position in sync with the drag widget position
-                Point dragWidgetPosition = e.GetPosition(_dragWidget);
-                if (dragWidgetPosition.X < 0 || dragWidgetPosition.X > _dragWidget.ActualWidth || dragWidgetPosition.Y < 0 || dragWidgetPosition.Y > _dragWidget.ActualHeight)
-                {
-                    return;
-                }
+    void ChildWindow_IsVisibleChanged( object sender, DependencyPropertyChangedEventArgs e )
+    {
+      if( ( bool )e.NewValue )
+        Focus();
+    }
 
-                _oldPosition = new Point(Left, Top);
-                _clickPoint = e.GetPosition(Window.GetWindow(this)); //store the point where we are relative to the window
-            }
-        }
+    void HeaderLeftMouseButtonDown( object sender, MouseButtonEventArgs e )
+    {
+      e.Handled = true;
+      Focus();
+      _dragWidget.CaptureMouse();
+      _isMouseCaptured = true;
+      _clickPoint = e.GetPosition( null ); //save off the mouse position
+      _oldPosition = new Point( Left, Top ); //save off our original window position
+    }
 
-        private void ParentContainer_LayoutUpdated(object sender, EventArgs e)
-        {
-            if (DesignerProperties.GetIsInDesignMode(this))
-                return;
+    private void HeaderMouseLeftButtonUp( object sender, MouseButtonEventArgs e )
+    {
+      e.Handled = true;
+      _dragWidget.ReleaseMouseCapture();
+      _isMouseCaptured = false;
+    }
 
-            //we only want to set the start position if this is the first time the control has bee initialized
-            if (!_startupPositionInitialized)
-            {
-                ExecuteOpen();
-                _startupPositionInitialized = true;
-            }
-        }
+    private void HeaderMouseMove( MouseEventArgs e )
+    {
+      if( _isMouseCaptured && Visibility == Visibility.Visible )
+      {
+        Point currentPosition = e.GetPosition( null ); //our current mouse position
 
-        void ParentContainer_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            //resize our modal layer
-            _modalLayer.Height = e.NewSize.Height;
-            _modalLayer.Width = e.NewSize.Width;
+        Left = _oldPosition.X + ( currentPosition.X - _clickPoint.X );
+        Top = _oldPosition.Y + ( currentPosition.Y - _clickPoint.Y );
 
-            //reposition our window
-            Left = GetRestrictedLeft();
-            Top = GetRestrictedTop();
+        //this helps keep our mouse position in sync with the drag widget position
+        Point dragWidgetPosition = e.GetPosition( _dragWidget );
+        if( dragWidgetPosition.X < 0 || dragWidgetPosition.X > _dragWidget.ActualWidth || dragWidgetPosition.Y < 0 || dragWidgetPosition.Y > _dragWidget.ActualHeight )
+        {
+          return;
         }
 
-        #endregion //Event Handlers
+        _oldPosition = new Point( Left, Top );
+        _clickPoint = e.GetPosition( Window.GetWindow( this ) ); //store the point where we are relative to the window
+      }
+    }
+
+    private void ParentContainer_LayoutUpdated( object sender, EventArgs e )
+    {
+      if( DesignerProperties.GetIsInDesignMode( this ) )
+        return;
+
+      //we only want to set the start position if this is the first time the control has bee initialized
+      if( !_startupPositionInitialized )
+      {
+        ExecuteOpen();
+        _startupPositionInitialized = true;
+      }
+    }
 
-        #region Methods
+    void ParentContainer_SizeChanged( object sender, SizeChangedEventArgs e )
+    {
+      //resize our modal layer
+      _modalLayer.Height = e.NewSize.Height;
+      _modalLayer.Width = e.NewSize.Width;
 
-        #region Private
+      //reposition our window
+      Left = GetRestrictedLeft();
+      Top = GetRestrictedTop();
+    }
 
-        private double GetRestrictedLeft()
-        {
-            if (Left < 0)
-                return 0;
+    #endregion //Event Handlers
 
-            if (_parentContainer != null)
-            {
-                if (Left + WindowRoot.ActualWidth > _parentContainer.ActualWidth && _parentContainer.ActualWidth != 0)
-                {
-                    double left = _parentContainer.ActualWidth - WindowRoot.ActualWidth;
-                    return left < 0 ? 0 : left;
-                }
-            }
-
-            return Left;
-        }
+    #region Methods
 
-        private double GetRestrictedTop()
-        {
-            if (Top < 0)
-                return 0;
+    #region Private
 
-            if (_parentContainer != null)
-            {
-                if (Top + WindowRoot.ActualHeight > _parentContainer.ActualHeight && _parentContainer.ActualHeight != 0)
-                {
-                    double top = _parentContainer.ActualHeight - WindowRoot.ActualHeight;
-                    return top < 0 ? 0 : top;
-                }
-            }
-
-            return Top;
-        }
+    private double GetRestrictedLeft()
+    {
+      if( Left < 0 )
+        return 0;
 
-        private void SetWindowState(WindowState state)
+      if( _parentContainer != null )
+      {
+        if( Left + WindowRoot.ActualWidth > _parentContainer.ActualWidth && _parentContainer.ActualWidth != 0 )
         {
-            switch (state)
-            {
-                case WindowState.Closed:
-                    {
-                        ExecuteClose();
-                        break;
-                    }
-                case WindowState.Open:
-                    {
-                        ExecuteOpen();
-                        break;
-                    }
-            }
+          double left = _parentContainer.ActualWidth - WindowRoot.ActualWidth;
+          return left < 0 ? 0 : left;
         }
+      }
 
-        private void ExecuteClose()
-        {
-            CancelEventArgs e = new CancelEventArgs();
-            OnClosing(e);
+      return Left;
+    }
 
-            if (!e.Cancel)
-            {
-                if (!_dialogResult.HasValue)
-                    _dialogResult = false;
+    private double GetRestrictedTop()
+    {
+      if( Top < 0 )
+        return 0;
 
-                OnClosed(EventArgs.Empty);
-            }
-            else
-            {
-                CancelClose();
-            }
+      if( _parentContainer != null )
+      {
+        if( Top + WindowRoot.ActualHeight > _parentContainer.ActualHeight && _parentContainer.ActualHeight != 0 )
+        {
+          double top = _parentContainer.ActualHeight - WindowRoot.ActualHeight;
+          return top < 0 ? 0 : top;
         }
+      }
 
-        private void CancelClose()
-        {
-            _dialogResult = null; //when the close is cancelled, DialogResult should be null
+      return Top;
+    }
 
-            _ignorePropertyChanged = true;
-            WindowState = WindowState.Open; //now reset the window state to open because the close was cancelled
-            _ignorePropertyChanged = false;
-        }
+    private void SetWindowState( WindowState state )
+    {
+      switch( state )
+      {
+        case WindowState.Closed:
+          {
+            ExecuteClose();
+            break;
+          }
+        case WindowState.Open:
+          {
+            ExecuteOpen();
+            break;
+          }
+      }
+    }
 
-        private void ExecuteOpen()
-        {
-            _dialogResult = null; //reset the dialogResult to null each time the window is opened
+    private void ExecuteClose()
+    {
+      CancelEventArgs e = new CancelEventArgs();
+      OnClosing( e );
+
+      if( !e.Cancel )
+      {
+        if( !_dialogResult.HasValue )
+          _dialogResult = false;
+
+        OnClosed( EventArgs.Empty );
+      }
+      else
+      {
+        CancelClose();
+      }
+    }
 
-            if (WindowStartupLocation == Controls.WindowStartupLocation.Center)
-                CenterChildWindow();
+    private void CancelClose()
+    {
+      _dialogResult = null; //when the close is cancelled, DialogResult should be null
 
-            BringToFront();
-        }
+      _ignorePropertyChanged = true;
+      WindowState = WindowState.Open; //now reset the window state to open because the close was cancelled
+      _ignorePropertyChanged = false;
+    }
 
-        private void BringToFront()
-        {
-            int index = 0;
+    private void ExecuteOpen()
+    {
+      _dialogResult = null; //reset the dialogResult to null each time the window is opened
 
-            if (_parentContainer != null)
-                index = (int)_parentContainer.GetValue(Canvas.ZIndexProperty);
+      if( WindowStartupLocation == Controls.WindowStartupLocation.Center )
+        CenterChildWindow();
 
-            SetValue(Canvas.ZIndexProperty, ++index);
+      BringToFront();
+    }
 
-            if (IsModal)
-                Canvas.SetZIndex(_modalLayerPanel, index - 2);
-        }
+    private void BringToFront()
+    {
+      int index = 0;
 
-        private void CenterChildWindow()
-        {
-            if (_parentContainer != null)
-            {
-                Left = (_parentContainer.ActualWidth - WindowRoot.ActualWidth) / 2.0;
-                Top = (_parentContainer.ActualHeight - WindowRoot.ActualHeight) / 2.0;
-            }
-        }
+      if( _parentContainer != null )
+        index = ( int )_parentContainer.GetValue( Canvas.ZIndexProperty );
 
-        private void ShowModalLayer()
-        {
-            if (!DesignerProperties.GetIsInDesignMode(this))
-            {
-                if (!_modalLayerPanel.Children.Contains(_modalLayer))
-                    _modalLayerPanel.Children.Add(_modalLayer);
+      SetValue( Canvas.ZIndexProperty, ++index );
 
-                _modalLayer.Visibility = System.Windows.Visibility.Visible;
-            }
-        }
+      if( IsModal )
+        Canvas.SetZIndex( _modalLayerPanel, index - 2 );
+    }
 
-        private void HideModalLayer()
-        {
-            _modalLayer.Visibility = System.Windows.Visibility.Collapsed;
-        }
+    private void CenterChildWindow()
+    {
+      if( _parentContainer != null )
+      {
+        Left = ( _parentContainer.ActualWidth - WindowRoot.ActualWidth ) / 2.0;
+        Top = ( _parentContainer.ActualHeight - WindowRoot.ActualHeight ) / 2.0;
+      }
+    }
 
-        private void ProcessMove(double x, double y)
-        {
-            _moveTransform.X += x;
-            _moveTransform.Y += y;
+    private void ShowModalLayer()
+    {
+      if( !DesignerProperties.GetIsInDesignMode( this ) )
+      {
+        if( !_modalLayerPanel.Children.Contains( _modalLayer ) )
+          _modalLayerPanel.Children.Add( _modalLayer );
 
-            InvalidateArrange();
-        }
+        _modalLayer.Visibility = System.Windows.Visibility.Visible;
+      }
+    }
 
-        #endregion //Private
+    private void HideModalLayer()
+    {
+      _modalLayer.Visibility = System.Windows.Visibility.Collapsed;
+    }
 
-        #region Public
+    private void ProcessMove( double x, double y )
+    {
+      _moveTransform.X += x;
+      _moveTransform.Y += y;
 
-        public void Show()
-        {
-            WindowState = WindowState.Open;
-        }
+      InvalidateArrange();
+    }
 
-        public void Close()
-        {
-            WindowState = WindowState.Closed;
-        }
+    #endregion //Private
 
-        #endregion //Public
+    #region Public
 
-        #endregion //Methods
+    public void Show()
+    {
+      WindowState = WindowState.Open;
+    }
 
-        #region Events
+    public void Close()
+    {
+      WindowState = WindowState.Closed;
+    }
 
-        /// <summary>
-        /// Occurs when the ChildWindow is closed.
-        /// </summary>
-        public event EventHandler Closed;
-        protected virtual void OnClosed(EventArgs e)
-        {
-            if (Closed != null)
-                Closed(this, e);
-        }
+    #endregion //Public
 
-        /// <summary>
-        /// Occurs when the ChildWindow is closing.
-        /// </summary>
-        public event EventHandler<CancelEventArgs> Closing;
-        protected virtual void OnClosing(CancelEventArgs e)
-        {
-            if (Closing != null)
-                Closing(this, e);
-        }
+    #endregion //Methods
+
+    #region Events
+
+    /// <summary>
+    /// Occurs when the ChildWindow is closed.
+    /// </summary>
+    public event EventHandler Closed;
+    protected virtual void OnClosed( EventArgs e )
+    {
+      if( Closed != null )
+        Closed( this, e );
+    }
 
-        #endregion //Events
+    /// <summary>
+    /// Occurs when the ChildWindow is closing.
+    /// </summary>
+    public event EventHandler<CancelEventArgs> Closing;
+    protected virtual void OnClosing( CancelEventArgs e )
+    {
+      if( Closing != null )
+        Closing( this, e );
     }
+
+    #endregion //Events
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs
index e212e837..91f46e14 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowStartupLocation.cs
@@ -1,10 +1,27 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls
 {
-    public enum WindowStartupLocation
-    {
-        Center,
-        Manual
-    }
+  public enum WindowStartupLocation
+  {
+    Center,
+    Manual
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs
index c5055e8d..6e0650a6 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Implementation/WindowState.cs
@@ -1,10 +1,27 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls
 {
-    public enum WindowState
-    {
-        Closed,
-        Open
-    }
+  public enum WindowState
+  {
+    Closed,
+    Open
+  }
 }
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml
index 6b8fea5f..8db4170d 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml
@@ -1,211 +1,239 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                     xmlns:local="clr-namespace:Microsoft.Windows.Controls">
-
-    <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="0.479" Color="#FFf4f5f6"/>
-                <GradientStop Offset="1" Color="#FFd0d6db"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFb5bdc8"/>
-                <GradientStop Offset="0.370" Color="#FF8399a9"/>
-                <GradientStop Offset="0.370" Color="#FF718597"/>
-                <GradientStop Offset="0.906" Color="#FFb9c1ca"/>
-                <GradientStop Offset="1" Color="#FFb9c1ca"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FF6b7c8d"/>
-                <GradientStop Offset="0.370" Color="#FF4d606f"/>
-                <GradientStop Offset="0.370" Color="#FF465460"/>
-                <GradientStop Offset="0.906" Color="#FF262d33"/>
-                <GradientStop Offset="1" Color="#FF262d33"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="#FF000000"/>
-        <Setter Property="Padding" Value="3"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}"></DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}"></DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
-                            <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0"/>
-                        </Border>
-                        <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                        <Path x:Name="path"
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls">
+
+   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFb5bdc8" />
+            <GradientStop Offset="0.370" Color="#FF8399a9" />
+            <GradientStop Offset="0.370" Color="#FF718597" />
+            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
+            <GradientStop Offset="1" Color="#FFb9c1ca" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FF6b7c8d" />
+            <GradientStop Offset="0.370" Color="#FF4d606f" />
+            <GradientStop Offset="0.370" Color="#FF465460" />
+            <GradientStop Offset="0.906" Color="#FF262d33" />
+            <GradientStop Offset="1" Color="#FF262d33" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
+      <Setter Property="Foreground" Value="#FF000000" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Button">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
+                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                  <Path x:Name="path"
 								Height="6"
 								Width="7"
 								Stretch="Fill"
 								Opacity="1"
 								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
-								Fill="White" Margin="0,0,0,1" Visibility="Collapsed" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- =============================================================================== -->
-    <!-- ChildWindow                                                                      -->
-    <!-- =============================================================================== -->
-
-    <SolidColorBrush x:Key="ChildWindowMainBrushColor" Color="#FF3C688D"/>
-    <LinearGradientBrush x:Key="BorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#7FFFFFFF" Offset="0.05"/>
-        <GradientStop Color="#B2FFFFFF" Offset="0.07"/>
-        <GradientStop Color="#00FFFFFF" Offset="1"/>
-    </LinearGradientBrush>
-
-    <Style TargetType="{x:Type local:ChildWindow}">
-        <Setter Property="Background" Value="#FFFFFFFF"/>
-        <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CaptionForeground" Value="#FF000000" />
-        <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
-        <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
-        <Setter Property="WindowOpacity" Value="1.0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:ChildWindow}">
-                    <Grid x:Name="Root">
-                        <Grid.Resources>
-                            <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-                            <Style x:Key="FocusVisualStyle" TargetType="Control">
-                                <Setter Property="BorderBrush" Value="Black"/>
-                                <Setter Property="Background" Value="Transparent"/>
-                                <Setter Property="Margin" Value="-1"/>
-                                <Setter Property="Template">
-                                    <Setter.Value>
-                                        <ControlTemplate>
-                                            <Rectangle Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" Margin="{TemplateBinding Margin}" StrokeDashArray="4 3" StrokeThickness="0.5">
-                                                <Rectangle.RenderTransform>
-                                                    <TranslateTransform X="{Binding Left}" Y="{Binding Top}"/>
-                                                </Rectangle.RenderTransform>
-                                            </Rectangle>
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                        </Grid.Resources>
-
-                        <Grid x:Name="PART_WindowRoot" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" >
-                            <Grid.RenderTransform>
-                                <TransformGroup>
-                                    <ScaleTransform />
-                                    <SkewTransform />
-                                    <RotateTransform />
-                                    <TranslateTransform />
-                                </TransformGroup>
-                            </Grid.RenderTransform>
-
-                            <!-- Borders -->
-                            <Grid  x:Name="WindowGrid">
-                                <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}"/>
-                                <Grid Margin="0" Background="{x:Null}">
-                                    <Border x:Name="WindowBorder" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}"/>
-                                    <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7"/>
-                                </Grid>
-                            </Grid>
-
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" MinHeight="26"/>
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-
-                                <!-- Content Border -->
-                                <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition/>
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1"/>
-                                    <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-
-                                        <ContentPresenter x:Name="Content"  Content="{TemplateBinding Content}" 
-                                                              ContentTemplate="{TemplateBinding ContentTemplate}" />
-                                    </Border>
-                                </Grid>
-
-                                <!-- Header -->
-                                <Border x:Name="PART_DragWidget" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
-                                    <Grid>
-                                        <Grid x:Name="CaptionHeader"  Margin="1,1,105,0" VerticalAlignment="Center">
-                                            <!-- Caption -->
-                                            <ContentControl x:Name="Caption" Margin="5,0,0,0" IsTabStop="False" HorizontalAlignment="Stretch"
-                                                        Content="{TemplateBinding Caption}"
-                                                        Foreground="{TemplateBinding CaptionForeground}"/>
-
-                                        </Grid>
-                                    </Grid>
-                                </Border>
-                            </Grid>
-
-                            <!-- Buttons -->
-                            <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
-                                <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Visibility="{TemplateBinding CloseButtonVisibility}" Height="17" Width="43" IsTabStop="False">
-                                    <Path Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Width="12" Fill="#E4FFFFFF" Stretch="Fill" Stroke="#FF535666" 
-                                      Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z"/>
-                                </Button>
-                            </Border>
+								Fill="White"
+                        Margin="0,0,0,1"
+                        Visibility="Collapsed" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- ChildWindow                                                                      -->
+   <!-- =============================================================================== -->
+
+   <SolidColorBrush x:Key="ChildWindowMainBrushColor" Color="#FF3C688D" />
+   <LinearGradientBrush x:Key="BorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#7FFFFFFF" Offset="0.05" />
+      <GradientStop Color="#B2FFFFFF" Offset="0.07" />
+      <GradientStop Color="#00FFFFFF" Offset="1" />
+   </LinearGradientBrush>
+
+   <Style TargetType="{x:Type local:ChildWindow}">
+      <Setter Property="Background" Value="#FFFFFFFF" />
+      <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="CaptionForeground" Value="#FF000000" />
+      <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="VerticalContentAlignment" Value="Top" />
+      <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
+      <Setter Property="WindowOpacity" Value="1.0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ChildWindow}">
+               <Grid x:Name="Root">
+                  <Grid.Resources>
+                     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+                     <Style x:Key="FocusVisualStyle" TargetType="Control">
+                        <Setter Property="BorderBrush" Value="Black" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Margin" Value="-1" />
+                        <Setter Property="Template">
+                           <Setter.Value>
+                              <ControlTemplate>
+                                 <Rectangle Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" Margin="{TemplateBinding Margin}" StrokeDashArray="4 3" StrokeThickness="0.5">
+                                    <Rectangle.RenderTransform>
+                                       <TranslateTransform X="{Binding Left}" Y="{Binding Top}" />
+                                    </Rectangle.RenderTransform>
+                                 </Rectangle>
+                              </ControlTemplate>
+                           </Setter.Value>
+                        </Setter>
+                     </Style>
+                  </Grid.Resources>
+
+                  <Grid x:Name="PART_WindowRoot" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                     <Grid.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform />
+                           <SkewTransform />
+                           <RotateTransform />
+                           <TranslateTransform />
+                        </TransformGroup>
+                     </Grid.RenderTransform>
+
+                     <!-- Borders -->
+                     <Grid  x:Name="WindowGrid">
+                        <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                        <Grid Margin="0" Background="{x:Null}">
+                           <Border x:Name="WindowBorder" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                           <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7" />
+                        </Grid>
+                     </Grid>
+
+                     <Grid>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" MinHeight="26" />
+                           <RowDefinition />
+                        </Grid.RowDefinitions>
+
+                        <!-- Content Border -->
+                        <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
+                           <Grid.RowDefinitions>
+                              <RowDefinition />
+                              <RowDefinition Height="Auto" />
+                           </Grid.RowDefinitions>
+                           <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1" />
+                           <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+                              <ContentPresenter x:Name="Content"
+                                                Content="{TemplateBinding Content}" 
+                                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+                           </Border>
                         </Grid>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="WindowState" Value="Closed">
-                            <Setter Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+
+                        <!-- Header -->
+                        <Border x:Name="PART_DragWidget" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
+                           <Grid>
+                              <Grid x:Name="CaptionHeader" Margin="1,1,105,0" VerticalAlignment="Center">
+                                 <!-- Caption -->
+                                 <ContentControl x:Name="Caption"
+                                                 Margin="5,0,0,0"
+                                                 IsTabStop="False"
+                                                 HorizontalAlignment="Stretch"
+                                                 Content="{TemplateBinding Caption}"
+                                                 Foreground="{TemplateBinding CaptionForeground}" />
+                              </Grid>
+                           </Grid>
+                        </Border>
+                     </Grid>
+
+                     <!-- Buttons -->
+                     <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
+                        <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Visibility="{TemplateBinding CloseButtonVisibility}" Height="17" Width="43" IsTabStop="False">
+                           <Path Height="10"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center"
+                                 Width="12"
+                                 Fill="#E4FFFFFF"
+                                 Stretch="Fill"
+                                 Stroke="#FF535666" 
+                                 Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z" />
+                        </Button>
+                     </Border>
+                  </Grid>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="WindowState" Value="Closed">
+                     <Setter Property="Visibility" Value="Collapsed" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs
index 2da5c22d..86ddbb47 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Implementation/ButtonChrome.cs
@@ -1,208 +1,274 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 using System.Windows.Controls;
 
 namespace Microsoft.Windows.Controls.Chromes
 {
-    public class ButtonChrome : ContentControl
-    {
-        #region CornerRadius
-
-        public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register("CornerRadius", typeof(CornerRadius), typeof(ButtonChrome), new UIPropertyMetadata(default(CornerRadius), new PropertyChangedCallback(OnCornerRadiusChanged)));
-        public CornerRadius CornerRadius
-        {
-            get { return (CornerRadius)GetValue(CornerRadiusProperty); }
-            set { SetValue(CornerRadiusProperty, value); }
-        }
-
-        private static void OnCornerRadiusChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ButtonChrome buttonChrome = o as ButtonChrome;
-            if (buttonChrome != null)
-                buttonChrome.OnCornerRadiusChanged((CornerRadius)e.OldValue, (CornerRadius)e.NewValue);
-        }
-
-        protected virtual void OnCornerRadiusChanged(CornerRadius oldValue, CornerRadius newValue)
-        {
-            //we always want the InnerBorderRadius to be one less than the CornerRadius
-            CornerRadius newInnerCornerRadius = new CornerRadius(Math.Max(0, newValue.TopLeft - 1), 
-                                                                 Math.Max(0, newValue.TopRight - 1), 
-                                                                 Math.Max(0, newValue.BottomRight - 1), 
-                                                                 Math.Max(0, newValue.BottomLeft - 1));
-
-            InnerCornerRadius = newInnerCornerRadius;
-        }
-
-        #endregion //CornerRadius
-
-        #region InnerCornerRadius
-
-        public static readonly DependencyProperty InnerCornerRadiusProperty = DependencyProperty.Register("InnerCornerRadius", typeof(CornerRadius), typeof(ButtonChrome), new UIPropertyMetadata(default(CornerRadius), new PropertyChangedCallback(OnInnerCornerRadiusChanged)));
-        public CornerRadius InnerCornerRadius
-        {
-            get { return (CornerRadius)GetValue(InnerCornerRadiusProperty); }
-            set { SetValue(InnerCornerRadiusProperty, value); }
-        }
-
-        private static void OnInnerCornerRadiusChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ButtonChrome buttonChrome = o as ButtonChrome;
-            if (buttonChrome != null)
-                buttonChrome.OnInnerCornerRadiusChanged((CornerRadius)e.OldValue, (CornerRadius)e.NewValue);
-        }
-
-        protected virtual void OnInnerCornerRadiusChanged(CornerRadius oldValue, CornerRadius newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
-
-        #endregion //InnerCornerRadius
-
-        #region RenderChecked
-
-        public static readonly DependencyProperty RenderCheckedProperty = DependencyProperty.Register("RenderChecked", typeof(bool), typeof(ButtonChrome), new UIPropertyMetadata(false, OnRenderCheckedChanged));
-        public bool RenderChecked
-        {
-            get { return (bool)GetValue(RenderCheckedProperty); }
-            set { SetValue(RenderCheckedProperty, value); }
-        }
-
-        private static void OnRenderCheckedChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ButtonChrome buttonChrome = o as ButtonChrome;
-            if (buttonChrome != null)
-                buttonChrome.OnRenderCheckedChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
-
-        protected virtual void OnRenderCheckedChanged(bool oldValue, bool newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
-
-        #endregion //RenderChecked
-
-        #region RenderEnabled
-
-        public static readonly DependencyProperty RenderEnabledProperty = DependencyProperty.Register("RenderEnabled", typeof(bool), typeof(ButtonChrome), new UIPropertyMetadata(true, OnRenderEnabledChanged));
-        public bool RenderEnabled
-        {
-            get { return (bool)GetValue(RenderEnabledProperty); }
-            set { SetValue(RenderEnabledProperty, value); }
-        }
-
-        private static void OnRenderEnabledChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ButtonChrome buttonChrome = o as ButtonChrome;
-            if (buttonChrome != null)
-                buttonChrome.OnRenderEnabledChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
-
-        protected virtual void OnRenderEnabledChanged(bool oldValue, bool newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
-
-        #endregion //RenderEnabled
-
-        #region RenderFocused
-
-        public static readonly DependencyProperty RenderFocusedProperty = DependencyProperty.Register("RenderFocused", typeof(bool), typeof(ButtonChrome), new UIPropertyMetadata(false, OnRenderFocusedChanged));
-        public bool RenderFocused
-        {
-            get { return (bool)GetValue(RenderFocusedProperty); }
-            set { SetValue(RenderFocusedProperty, value); }
-        }
-
-        private static void OnRenderFocusedChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ButtonChrome buttonChrome = o as ButtonChrome;
-            if (buttonChrome != null)
-                buttonChrome.OnRenderFocusedChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
-
-        protected virtual void OnRenderFocusedChanged(bool oldValue, bool newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
-
-        #endregion //RenderFocused
-
-        #region RenderMouseOver
-
-        public static readonly DependencyProperty RenderMouseOverProperty = DependencyProperty.Register("RenderMouseOver", typeof(bool), typeof(ButtonChrome), new UIPropertyMetadata(false, OnRenderMouseOverChanged));
-        public bool RenderMouseOver
-        {
-            get { return (bool)GetValue(RenderMouseOverProperty); }
-            set { SetValue(RenderMouseOverProperty, value); }
-        }
-
-        private static void OnRenderMouseOverChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ButtonChrome buttonChrome = o as ButtonChrome;
-            if (buttonChrome != null)
-                buttonChrome.OnRenderMouseOverChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
-
-        protected virtual void OnRenderMouseOverChanged(bool oldValue, bool newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
-
-        #endregion //RenderMouseOver
-
-        #region RenderNormal
-
-        public static readonly DependencyProperty RenderNormalProperty = DependencyProperty.Register("RenderNormal", typeof(bool), typeof(ButtonChrome), new UIPropertyMetadata(true, OnRenderNormalChanged));
-        public bool RenderNormal
-        {
-            get { return (bool)GetValue(RenderNormalProperty); }
-            set { SetValue(RenderNormalProperty, value); }
-        }
-
-        private static void OnRenderNormalChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ButtonChrome buttonChrome = o as ButtonChrome;
-            if (buttonChrome != null)
-                buttonChrome.OnRenderNormalChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
-
-        protected virtual void OnRenderNormalChanged(bool oldValue, bool newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
-
-        #endregion //RenderNormal
-
-        #region RenderPressed
-
-        public static readonly DependencyProperty RenderPressedProperty = DependencyProperty.Register("RenderPressed", typeof(bool), typeof(ButtonChrome), new UIPropertyMetadata(false, OnRenderPressedChanged));
-        public bool RenderPressed
-        {
-            get { return (bool)GetValue(RenderPressedProperty); }
-            set { SetValue(RenderPressedProperty, value); }
-        }
-
-        private static void OnRenderPressedChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ButtonChrome buttonChrome = o as ButtonChrome;
-            if (buttonChrome != null)
-                buttonChrome.OnRenderPressedChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
-
-        protected virtual void OnRenderPressedChanged(bool oldValue, bool newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
-
-        #endregion //RenderPressed
-
-        #region Contsructors
-
-        static ButtonChrome()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(ButtonChrome), new FrameworkPropertyMetadata(typeof(ButtonChrome)));
-        }
-
-        #endregion //Contsructors
+  public class ButtonChrome : ContentControl
+  {
+    #region CornerRadius
+
+    public static readonly DependencyProperty CornerRadiusProperty = DependencyProperty.Register( "CornerRadius", typeof( CornerRadius ), typeof( ButtonChrome ), new UIPropertyMetadata( default( CornerRadius ), new PropertyChangedCallback( OnCornerRadiusChanged ) ) );
+    public CornerRadius CornerRadius
+    {
+      get
+      {
+        return ( CornerRadius )GetValue( CornerRadiusProperty );
+      }
+      set
+      {
+        SetValue( CornerRadiusProperty, value );
+      }
+    }
+
+    private static void OnCornerRadiusChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnCornerRadiusChanged( ( CornerRadius )e.OldValue, ( CornerRadius )e.NewValue );
+    }
+
+    protected virtual void OnCornerRadiusChanged( CornerRadius oldValue, CornerRadius newValue )
+    {
+      //we always want the InnerBorderRadius to be one less than the CornerRadius
+      CornerRadius newInnerCornerRadius = new CornerRadius( Math.Max( 0, newValue.TopLeft - 1 ),
+                                                           Math.Max( 0, newValue.TopRight - 1 ),
+                                                           Math.Max( 0, newValue.BottomRight - 1 ),
+                                                           Math.Max( 0, newValue.BottomLeft - 1 ) );
+
+      InnerCornerRadius = newInnerCornerRadius;
+    }
+
+    #endregion //CornerRadius
+
+    #region InnerCornerRadius
+
+    public static readonly DependencyProperty InnerCornerRadiusProperty = DependencyProperty.Register( "InnerCornerRadius", typeof( CornerRadius ), typeof( ButtonChrome ), new UIPropertyMetadata( default( CornerRadius ), new PropertyChangedCallback( OnInnerCornerRadiusChanged ) ) );
+    public CornerRadius InnerCornerRadius
+    {
+      get
+      {
+        return ( CornerRadius )GetValue( InnerCornerRadiusProperty );
+      }
+      set
+      {
+        SetValue( InnerCornerRadiusProperty, value );
+      }
+    }
+
+    private static void OnInnerCornerRadiusChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnInnerCornerRadiusChanged( ( CornerRadius )e.OldValue, ( CornerRadius )e.NewValue );
+    }
+
+    protected virtual void OnInnerCornerRadiusChanged( CornerRadius oldValue, CornerRadius newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //InnerCornerRadius
+
+    #region RenderChecked
+
+    public static readonly DependencyProperty RenderCheckedProperty = DependencyProperty.Register( "RenderChecked", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderCheckedChanged ) );
+    public bool RenderChecked
+    {
+      get
+      {
+        return ( bool )GetValue( RenderCheckedProperty );
+      }
+      set
+      {
+        SetValue( RenderCheckedProperty, value );
+      }
+    }
+
+    private static void OnRenderCheckedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderCheckedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderCheckedChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderChecked
+
+    #region RenderEnabled
+
+    public static readonly DependencyProperty RenderEnabledProperty = DependencyProperty.Register( "RenderEnabled", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( true, OnRenderEnabledChanged ) );
+    public bool RenderEnabled
+    {
+      get
+      {
+        return ( bool )GetValue( RenderEnabledProperty );
+      }
+      set
+      {
+        SetValue( RenderEnabledProperty, value );
+      }
+    }
+
+    private static void OnRenderEnabledChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderEnabledChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderEnabledChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderEnabled
+
+    #region RenderFocused
+
+    public static readonly DependencyProperty RenderFocusedProperty = DependencyProperty.Register( "RenderFocused", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderFocusedChanged ) );
+    public bool RenderFocused
+    {
+      get
+      {
+        return ( bool )GetValue( RenderFocusedProperty );
+      }
+      set
+      {
+        SetValue( RenderFocusedProperty, value );
+      }
+    }
+
+    private static void OnRenderFocusedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderFocusedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
     }
+
+    protected virtual void OnRenderFocusedChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderFocused
+
+    #region RenderMouseOver
+
+    public static readonly DependencyProperty RenderMouseOverProperty = DependencyProperty.Register( "RenderMouseOver", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderMouseOverChanged ) );
+    public bool RenderMouseOver
+    {
+      get
+      {
+        return ( bool )GetValue( RenderMouseOverProperty );
+      }
+      set
+      {
+        SetValue( RenderMouseOverProperty, value );
+      }
+    }
+
+    private static void OnRenderMouseOverChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderMouseOverChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderMouseOverChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderMouseOver
+
+    #region RenderNormal
+
+    public static readonly DependencyProperty RenderNormalProperty = DependencyProperty.Register( "RenderNormal", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( true, OnRenderNormalChanged ) );
+    public bool RenderNormal
+    {
+      get
+      {
+        return ( bool )GetValue( RenderNormalProperty );
+      }
+      set
+      {
+        SetValue( RenderNormalProperty, value );
+      }
+    }
+
+    private static void OnRenderNormalChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderNormalChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderNormalChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderNormal
+
+    #region RenderPressed
+
+    public static readonly DependencyProperty RenderPressedProperty = DependencyProperty.Register( "RenderPressed", typeof( bool ), typeof( ButtonChrome ), new UIPropertyMetadata( false, OnRenderPressedChanged ) );
+    public bool RenderPressed
+    {
+      get
+      {
+        return ( bool )GetValue( RenderPressedProperty );
+      }
+      set
+      {
+        SetValue( RenderPressedProperty, value );
+      }
+    }
+
+    private static void OnRenderPressedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ButtonChrome buttonChrome = o as ButtonChrome;
+      if( buttonChrome != null )
+        buttonChrome.OnRenderPressedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnRenderPressedChanged( bool oldValue, bool newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //RenderPressed
+
+    #region Contsructors
+
+    static ButtonChrome()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ButtonChrome ), new FrameworkPropertyMetadata( typeof( ButtonChrome ) ) );
+    }
+
+    #endregion //Contsructors
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml
index e65cbd75..cf63e8b0 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml
@@ -1,213 +1,231 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes">
 
-    <!-- =============================================================================== -->
-    <!-- ButtonChrome                                                                    -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type chrome:ButtonChrome}">
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="SnapsToDevicePixels" Value="True" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type chrome:ButtonChrome}">
-                    <Grid>
-
-                        <Border x:Name="OuterBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
-                            <Border x:Name="InnerBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}}" />
-                        </Border>
-
-                        <Border x:Name="MouseOverVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}">
-                            <Border x:Name="MouseOverInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}}" />
-                        </Border>
-                        <Border x:Name="PressedVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}">
-                            <Border x:Name="PressedInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
-                        </Border>
-
-                        <Border x:Name="FocusVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}}">
-                            <Border x:Name="FocusInnerVisual" BorderThickness="1" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedInnerBorderKey}}" />
-                        </Border>
-
-                        <ContentPresenter Margin="{TemplateBinding Padding}"
-										  IsEnabled="{TemplateBinding IsEnabled}"
-										  Content="{TemplateBinding Content}"
-										  ContentStringFormat="{TemplateBinding ContentStringFormat}"
-										  ContentTemplate="{TemplateBinding ContentTemplate}"
-										  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-
-                    </Grid>
-                    <ControlTemplate.Triggers>
-
-                        <!-- If button is disabled, not checked, and is rendered normal -->
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderEnabled" Value="False" />
-                                <Condition Property="RenderChecked" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
-                            <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonInnerBorderDisabledKey}}" />
-                            <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-                        </MultiTrigger>
-
-                        <!-- if button is enabled and pressed -->
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderEnabled" Value="True" />
-                                <Condition Property="RenderPressed" Value="True" />
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.050" Value="1" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.ExitActions>
-                        </MultiTrigger>
-
-                        <!-- if button is enabled, is not checked, the mouse is over, and not pressed -->
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderEnabled" Value="True" />
-                                <Condition Property="RenderChecked" Value="False" />
-                                <Condition Property="RenderMouseOver" Value="True" />
-                                <Condition Property="RenderPressed" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="1" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00.150">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.150" Value="0" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.ExitActions>
-                        </MultiTrigger>
-
-                        <!-- if button is enabled, checked, he mouse is not over, and it is not pressed -->
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderEnabled" Value="True" />
-                                <Condition Property="RenderChecked" Value="True" />
-                                <Condition Property="RenderMouseOver" Value="False" />
-                                <Condition Property="RenderPressed" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
-                            <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
-                            <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
-                        </MultiTrigger>
-
-                        <!-- if button is focused, is enabled, not pressed, and the mouse is not over -->
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderFocused" Value="True" />
-                                <Condition Property="RenderEnabled" Value="True" />
-                                <Condition Property="RenderPressed" Value="False" />
-                                <Condition Property="RenderMouseOver" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.EnterActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.25" Value="1" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.EnterActions>
-                            <MultiTrigger.ExitActions>
-                                <BeginStoryboard>
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
-                                            <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
-                                        </DoubleAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </BeginStoryboard>
-                            </MultiTrigger.ExitActions>
-                        </MultiTrigger>
-
-                        <!-- if not rendered normally -->
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="RenderNormal" Value="False" />
-                                <Condition Property="RenderChecked" Value="False" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="OuterBorder" Property="BorderBrush" Value="Transparent" />
-                            <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{x:Null}" />
-                            <Setter TargetName="OuterBorder" Property="Background" Value="Transparent" />
-                        </MultiTrigger>
-
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <!-- =============================================================================== -->
+   <!-- ButtonChrome                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type chrome:ButtonChrome}">
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="SnapsToDevicePixels" Value="True" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type chrome:ButtonChrome}">
+               <Grid>
+
+                  <Border x:Name="OuterBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
+                     <Border x:Name="InnerBorder" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}}" />
+                  </Border>
+
+                  <Border x:Name="MouseOverVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}}">
+                     <Border x:Name="MouseOverInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}}" />
+                  </Border>
+                  <Border x:Name="PressedVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}">
+                     <Border x:Name="PressedInnerVisual" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
+                  </Border>
+
+                  <Border x:Name="FocusVisual" Opacity="0" Visibility="Collapsed" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}}" Background="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}}">
+                     <Border x:Name="FocusInnerVisual" BorderThickness="1" CornerRadius="{TemplateBinding InnerCornerRadius}" BorderBrush="{DynamicResource {x:Static themes:ResourceKeys.ButtonFocusedInnerBorderKey}}" />
+                  </Border>
+
+                  <ContentPresenter Margin="{TemplateBinding Padding}"
+										      IsEnabled="{TemplateBinding IsEnabled}"
+										      Content="{TemplateBinding Content}"
+										      ContentStringFormat="{TemplateBinding ContentStringFormat}"
+										      ContentTemplate="{TemplateBinding ContentTemplate}"
+										      ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+
+               </Grid>
+               <ControlTemplate.Triggers>
+
+                  <!-- If button is disabled, not checked, and is rendered normal -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="False" />
+                        <Condition Property="RenderChecked" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}}" />
+                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonInnerBorderDisabledKey}}" />
+                     <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                  </MultiTrigger>
+
+                  <!-- if button is enabled and pressed -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderPressed" Value="True" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.050" Value="1" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.EnterActions>
+                     <MultiTrigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PressedVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.ExitActions>
+                  </MultiTrigger>
+
+                  <!-- if button is enabled, is not checked, the mouse is over, and not pressed -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderChecked" Value="False" />
+                        <Condition Property="RenderMouseOver" Value="True" />
+                        <Condition Property="RenderPressed" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="1" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.EnterActions>
+                     <MultiTrigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.150">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="MouseOverVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.150" Value="0" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.ExitActions>
+                  </MultiTrigger>
+
+                  <!-- if button is enabled, checked, he mouse is not over, and it is not pressed -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderChecked" Value="True" />
+                        <Condition Property="RenderMouseOver" Value="False" />
+                        <Condition Property="RenderPressed" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <Setter TargetName="OuterBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}}" />
+                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}}" />
+                     <Setter TargetName="OuterBorder" Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}}" />
+                  </MultiTrigger>
+
+                  <!-- if button is focused, is enabled, not pressed, and the mouse is not over -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderFocused" Value="True" />
+                        <Condition Property="RenderEnabled" Value="True" />
+                        <Condition Property="RenderPressed" Value="False" />
+                        <Condition Property="RenderMouseOver" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.EnterActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.25" Value="1" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.EnterActions>
+                     <MultiTrigger.ExitActions>
+                        <BeginStoryboard>
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00.115">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <DoubleAnimationUsingKeyFrames Storyboard.TargetName="FocusVisual" Storyboard.TargetProperty="Opacity">
+                                 <LinearDoubleKeyFrame KeyTime="00:00:00.115" Value="0" />
+                              </DoubleAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </BeginStoryboard>
+                     </MultiTrigger.ExitActions>
+                  </MultiTrigger>
+
+                  <!-- if not rendered normally -->
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="RenderNormal" Value="False" />
+                        <Condition Property="RenderChecked" Value="False" />
+                     </MultiTrigger.Conditions>
+                     <Setter TargetName="OuterBorder" Property="BorderBrush" Value="Transparent" />
+                     <Setter TargetName="InnerBorder" Property="BorderBrush" Value="{x:Null}" />
+                     <Setter TargetName="OuterBorder" Property="Background" Value="Transparent" />
+                  </MultiTrigger>
+
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs
index a652b7d8..03d7b225 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditor.cs
@@ -1,233 +1,281 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Collections.ObjectModel;
-using System.Collections;
-using System.Reflection;
 
 namespace Microsoft.Windows.Controls
 {
-    public class CollectionEditor : Control
-    {
-        #region Properties
-
-        public static readonly DependencyProperty ItemsProperty = DependencyProperty.Register("Items", typeof(ObservableCollection<object>), typeof(CollectionEditor), new UIPropertyMetadata(null));
-        public ObservableCollection<object> Items
-        {
-            get { return (ObservableCollection<object>)GetValue(ItemsProperty); }
-            set { SetValue(ItemsProperty, value); }
-        }
-
-        public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register("ItemsSource", typeof(IList), typeof(CollectionEditor), new UIPropertyMetadata(null, OnItemsSourceChanged));
-        public IList ItemsSource
-        {
-            get { return (IList)GetValue(ItemsSourceProperty); }
-            set { SetValue(ItemsSourceProperty, value); }
-        }
-
-        private static void OnItemsSourceChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            CollectionEditor collectionEditor = (CollectionEditor)d;
-            if (collectionEditor != null)
-                collectionEditor.OnItemSourceChanged((IList)e.OldValue, (IList)e.NewValue);
-        }
-
-        public void OnItemSourceChanged(IList oldValue, IList newValue)
-        {
-            if (newValue != null)
-            {
-                foreach (var item in newValue)
-                    Items.Add(CreateClone(item));
-            }
-        }
-
-        public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register("ItemsSourceType", typeof(Type), typeof(CollectionEditor), new UIPropertyMetadata(null, new PropertyChangedCallback(ItemsSourceTypeChanged)));
-        public Type ItemsSourceType
-        {
-            get { return (Type)GetValue(ItemsSourceTypeProperty); }
-            set { SetValue(ItemsSourceTypeProperty, value); }
-        }
-
-        private static void ItemsSourceTypeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            CollectionEditor collectionEditor = (CollectionEditor)d;
-            if (collectionEditor != null)
-                collectionEditor.ItemsSourceTypeChanged((Type)e.OldValue, (Type)e.NewValue);
-        }
-
-        protected virtual void ItemsSourceTypeChanged(Type oldValue, Type newValue)
-        {
-            NewItemTypes = GetNewItemTypes(newValue);
-        }
-
-        public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register("NewItemTypes", typeof(IList), typeof(CollectionEditor), new UIPropertyMetadata(null));
-        public IList<Type> NewItemTypes
-        {
-            get { return (IList<Type>)GetValue(NewItemTypesProperty); }
-            set { SetValue(NewItemTypesProperty, value); }
-        }
-
-        public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register("SelectedItem", typeof(object), typeof(CollectionEditor), new UIPropertyMetadata(null));
-        public object SelectedItem
-        {
-            get { return (object)GetValue(SelectedItemProperty); }
-            set { SetValue(SelectedItemProperty, value); }
-        }
-
-        #endregion //Properties
-
-        #region Constructors
-
-        static CollectionEditor()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(CollectionEditor), new FrameworkPropertyMetadata(typeof(CollectionEditor)));
-        }
-
-        public CollectionEditor()
-        {
-            Items = new ObservableCollection<object>();
-            CommandBindings.Add(new CommandBinding(ApplicationCommands.New, AddNew, CanAddNew));
-            CommandBindings.Add(new CommandBinding(ApplicationCommands.Delete, Delete, CanDelete));
-            CommandBindings.Add(new CommandBinding(ComponentCommands.MoveDown, MoveDown, CanMoveDown));
-            CommandBindings.Add(new CommandBinding(ComponentCommands.MoveUp, MoveUp, CanMoveUp));
-        }
-
-        #endregion //Constructors
-
-        #region Commands
-
-        private void AddNew(object sender, ExecutedRoutedEventArgs e)
-        {
-            var newItem = CreateNewItem((Type)e.Parameter);
-            Items.Add(newItem);
-            SelectedItem = newItem;
-        }
-
-        private void CanAddNew(object sender, CanExecuteRoutedEventArgs e)
-        {
-            Type t = e.Parameter as Type;
-            if (t != null && t.GetConstructor(Type.EmptyTypes) != null)
-                e.CanExecute = true;
-        }
-
-        private void Delete(object sender, ExecutedRoutedEventArgs e)
-        {
-            Items.Remove(e.Parameter);
-        }
-
-        private void CanDelete(object sender, CanExecuteRoutedEventArgs e)
-        {
-            e.CanExecute = e.Parameter != null;
-        }
-
-        private void MoveDown(object sender, ExecutedRoutedEventArgs e)
-        {
-            var selectedItem = e.Parameter;
-            var index = Items.IndexOf(selectedItem);
-            Items.RemoveAt(index);
-            Items.Insert(++index, selectedItem);
-            SelectedItem = selectedItem;
-        }
-
-        private void CanMoveDown(object sender, CanExecuteRoutedEventArgs e)
-        {
-            if (e.Parameter != null && Items.IndexOf(e.Parameter) < (Items.Count - 1))
-                e.CanExecute = true;
-        }
-
-        private void MoveUp(object sender, ExecutedRoutedEventArgs e)
-        {
-            var selectedItem = e.Parameter;
-            var index = Items.IndexOf(selectedItem);
-            Items.RemoveAt(index);
-            Items.Insert(--index, selectedItem);
-            SelectedItem = selectedItem;
-        }
-
-        private void CanMoveUp(object sender, CanExecuteRoutedEventArgs e)
-        {
-            if (e.Parameter != null && Items.IndexOf(e.Parameter) > 0)
-                e.CanExecute = true;
-        }
-
-        #endregion //Commands
-
-        #region Methods
-
-        private static void CopyValues(object source, object destination)
-        {
-            FieldInfo[] myObjectFields = source.GetType().GetFields(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
-            foreach (FieldInfo fi in myObjectFields)
-            {
-                fi.SetValue(destination, fi.GetValue(source));
-            }
-        }
-
-        private object CreateClone(object source)
-        {
-            object clone = null;
-
-            Type type = source.GetType();
-            clone = Activator.CreateInstance(type);
-            CopyValues(source, clone);
-
-            return clone;
-        }
-
-        private IList CreateItemsSource()
-        {
-            IList list = null;
-
-            if (ItemsSourceType != null)
-            {
-                ConstructorInfo constructor = ItemsSourceType.GetConstructor(Type.EmptyTypes);
-                list = (IList)constructor.Invoke(null);
-            }
-
-            return list;
-        }
-
-        private object CreateNewItem(Type type)
-        {
-            return Activator.CreateInstance(type);
-        }
-
-        private static List<Type> GetNewItemTypes(Type type)
-        {
-            List<Type> types = new List<Type>();
-            var newItemTypes = type.GetGenericArguments();
-            foreach (var t in newItemTypes)
-            {
-                types.Add(t);
-            }
-            return types;
-        }
-
-        public void PersistChanges()
-        {
-            IList list = ResolveItemsSource();
-            if (list == null)
-                return;
-
-            //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();
-
-            foreach (var item in Items)
-            {
-                list.Add(item);
-            }
-        }
-
-        private IList ResolveItemsSource()
-        {
-            if (ItemsSource == null)
-                ItemsSource = CreateItemsSource();
-
-            return ItemsSource;
-        }
-
-        #endregion //Methods
+  public class CollectionEditor : Control
+  {
+    #region Properties
+
+    public static readonly DependencyProperty ItemsProperty = DependencyProperty.Register( "Items", typeof( ObservableCollection<object> ), typeof( CollectionEditor ), new UIPropertyMetadata( null ) );
+    public ObservableCollection<object> Items
+    {
+      get
+      {
+        return ( ObservableCollection<object> )GetValue( ItemsProperty );
+      }
+      set
+      {
+        SetValue( ItemsProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( CollectionEditor ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
+    public IList ItemsSource
+    {
+      get
+      {
+        return ( IList )GetValue( ItemsSourceProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceProperty, value );
+      }
+    }
+
+    private static void OnItemsSourceChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      CollectionEditor collectionEditor = ( CollectionEditor )d;
+      if( collectionEditor != null )
+        collectionEditor.OnItemSourceChanged( ( IList )e.OldValue, ( IList )e.NewValue );
+    }
+
+    public void OnItemSourceChanged( IList oldValue, IList newValue )
+    {
+      if( newValue != null )
+      {
+        foreach( var item in newValue )
+          Items.Add( CreateClone( item ) );
+      }
+    }
+
+    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionEditor ), new UIPropertyMetadata( null, new PropertyChangedCallback( ItemsSourceTypeChanged ) ) );
+    public Type ItemsSourceType
+    {
+      get
+      {
+        return ( Type )GetValue( ItemsSourceTypeProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceTypeProperty, value );
+      }
     }
+
+    private static void ItemsSourceTypeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      CollectionEditor collectionEditor = ( CollectionEditor )d;
+      if( collectionEditor != null )
+        collectionEditor.ItemsSourceTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
+    }
+
+    protected virtual void ItemsSourceTypeChanged( Type oldValue, Type newValue )
+    {
+      NewItemTypes = GetNewItemTypes( newValue );
+    }
+
+    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionEditor ), new UIPropertyMetadata( null ) );
+    public IList<Type> NewItemTypes
+    {
+      get
+      {
+        return ( IList<Type> )GetValue( NewItemTypesProperty );
+      }
+      set
+      {
+        SetValue( NewItemTypesProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( CollectionEditor ), new UIPropertyMetadata( null ) );
+    public object SelectedItem
+    {
+      get
+      {
+        return ( object )GetValue( SelectedItemProperty );
+      }
+      set
+      {
+        SetValue( SelectedItemProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static CollectionEditor()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( CollectionEditor ), new FrameworkPropertyMetadata( typeof( CollectionEditor ) ) );
+    }
+
+    public CollectionEditor()
+    {
+      Items = new ObservableCollection<object>();
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.New, AddNew, CanAddNew ) );
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.Delete, Delete, CanDelete ) );
+      CommandBindings.Add( new CommandBinding( ComponentCommands.MoveDown, MoveDown, CanMoveDown ) );
+      CommandBindings.Add( new CommandBinding( ComponentCommands.MoveUp, MoveUp, CanMoveUp ) );
+    }
+
+    #endregion //Constructors
+
+    #region Commands
+
+    private void AddNew( object sender, ExecutedRoutedEventArgs e )
+    {
+      var newItem = CreateNewItem( ( Type )e.Parameter );
+      Items.Add( newItem );
+      SelectedItem = newItem;
+    }
+
+    private void CanAddNew( object sender, CanExecuteRoutedEventArgs e )
+    {
+      Type t = e.Parameter as Type;
+      if( t != null && t.GetConstructor( Type.EmptyTypes ) != null )
+        e.CanExecute = true;
+    }
+
+    private void Delete( object sender, ExecutedRoutedEventArgs e )
+    {
+      Items.Remove( e.Parameter );
+    }
+
+    private void CanDelete( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = e.Parameter != null;
+    }
+
+    private void MoveDown( object sender, ExecutedRoutedEventArgs e )
+    {
+      var selectedItem = e.Parameter;
+      var index = Items.IndexOf( selectedItem );
+      Items.RemoveAt( index );
+      Items.Insert( ++index, selectedItem );
+      SelectedItem = selectedItem;
+    }
+
+    private void CanMoveDown( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( e.Parameter != null && Items.IndexOf( e.Parameter ) < ( Items.Count - 1 ) )
+        e.CanExecute = true;
+    }
+
+    private void MoveUp( object sender, ExecutedRoutedEventArgs e )
+    {
+      var selectedItem = e.Parameter;
+      var index = Items.IndexOf( selectedItem );
+      Items.RemoveAt( index );
+      Items.Insert( --index, selectedItem );
+      SelectedItem = selectedItem;
+    }
+
+    private void CanMoveUp( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( e.Parameter != null && Items.IndexOf( e.Parameter ) > 0 )
+        e.CanExecute = true;
+    }
+
+    #endregion //Commands
+
+    #region Methods
+
+    private static void CopyValues( object source, object destination )
+    {
+      FieldInfo[] myObjectFields = source.GetType().GetFields( BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance );
+      foreach( FieldInfo fi in myObjectFields )
+      {
+        fi.SetValue( destination, fi.GetValue( source ) );
+      }
+    }
+
+    private object CreateClone( object source )
+    {
+      object clone = null;
+
+      Type type = source.GetType();
+      clone = Activator.CreateInstance( type );
+      CopyValues( source, clone );
+
+      return clone;
+    }
+
+    private IList CreateItemsSource()
+    {
+      IList list = null;
+
+      if( ItemsSourceType != null )
+      {
+        ConstructorInfo constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
+        list = ( IList )constructor.Invoke( null );
+      }
+
+      return list;
+    }
+
+    private object CreateNewItem( Type type )
+    {
+      return Activator.CreateInstance( type );
+    }
+
+    private static List<Type> GetNewItemTypes( Type type )
+    {
+      List<Type> types = new List<Type>();
+      var newItemTypes = type.GetGenericArguments();
+      foreach( var t in newItemTypes )
+      {
+        types.Add( t );
+      }
+      return types;
+    }
+
+    public void PersistChanges()
+    {
+      IList list = ResolveItemsSource();
+      if( list == null )
+        return;
+
+      //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();
+
+      foreach( var item in Items )
+      {
+        list.Add( item );
+      }
+    }
+
+    private IList ResolveItemsSource()
+    {
+      if( ItemsSource == null )
+        ItemsSource = CreateItemsSource();
+
+      return ItemsSource;
+    }
+
+    #endregion //Methods
+  }
 }
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml
index 85f5712a..09c2140d 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml
@@ -1,25 +1,46 @@
-<Window x:Class="Microsoft.Windows.Controls.CollectionEditorDialog"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<Window x:Class="Microsoft.Windows.Controls.CollectionEditorDialog"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:extToolkit="clr-namespace:Microsoft.Windows.Controls"
         xmlns:propertyGrid="clr-namespace:Microsoft.Windows.Controls.PropertyGrid"
-        Title="Collection Editor" Height="400" Width="600" WindowStartupLocation="CenterScreen">
-    
-    <Grid Margin="10">
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
-        
-        <extToolkit:CollectionEditor x:Name="_propertyGrid"
-                                     ItemsSourceType="{Binding ItemsSourceType, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
-                                     ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
-                                     NewItemTypes="{Binding NewItemTypes, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"/>
-
-        <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" Margin="5" >
-            <Button Width="75" Margin="2" Click="OkButton_Click" IsDefault="True">OK</Button>
-            <Button Width="75" Margin="2" IsCancel="True">Cancel</Button>
-        </StackPanel>
-
-    </Grid>
+        Title="Collection Editor" 
+        Height="400" 
+        Width="600" 
+        WindowStartupLocation="CenterScreen">
+
+   <Grid Margin="10">
+      <Grid.RowDefinitions>
+         <RowDefinition Height="*" />
+         <RowDefinition Height="Auto" />
+      </Grid.RowDefinitions>
+
+      <extToolkit:CollectionEditor x:Name="_propertyGrid"
+                                   ItemsSourceType="{Binding ItemsSourceType, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
+                                   ItemsSource="{Binding ItemsSource, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"
+                                   NewItemTypes="{Binding NewItemTypes, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
+
+      <StackPanel Orientation="Horizontal" Grid.Row="1" HorizontalAlignment="Right" Margin="5">
+         <Button Width="75" Margin="2" Click="OkButton_Click" IsDefault="True">OK</Button>
+         <Button Width="75" Margin="2" IsCancel="True">Cancel</Button>
+      </StackPanel>
+
+   </Grid>
 </Window>
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs
index 3b056024..75341803 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/CollectionEditorDialog.xaml.cs
@@ -1,63 +1,99 @@
-using System;
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Windows;
 
 namespace Microsoft.Windows.Controls
 {
-    /// <summary>
-    /// Interaction logic for CollectionEditorDialog.xaml
-    /// </summary>
-    public partial class CollectionEditorDialog : Window
+  /// <summary>
+  /// Interaction logic for CollectionEditorDialog.xaml
+  /// </summary>
+  public partial class CollectionEditorDialog : Window
+  {
+    #region Properties
+
+    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( CollectionEditorDialog ), new UIPropertyMetadata( null ) );
+    public IList ItemsSource
+    {
+      get
+      {
+        return ( IList )GetValue( ItemsSourceProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( CollectionEditorDialog ), new UIPropertyMetadata( null ) );
+    public Type ItemsSourceType
+    {
+      get
+      {
+        return ( Type )GetValue( ItemsSourceTypeProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceTypeProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register( "NewItemTypes", typeof( IList ), typeof( CollectionEditorDialog ), new UIPropertyMetadata( null ) );
+    public IList<Type> NewItemTypes
     {
-        #region Properties
-
-        public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register("ItemsSource", typeof(IList), typeof(CollectionEditorDialog), new UIPropertyMetadata(null));
-        public IList ItemsSource
-        {
-            get { return (IList)GetValue(ItemsSourceProperty); }
-            set { SetValue(ItemsSourceProperty, value); }
-        }
-
-        public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register("ItemsSourceType", typeof(Type), typeof(CollectionEditorDialog), new UIPropertyMetadata(null));
-        public Type ItemsSourceType
-        {
-            get { return (Type)GetValue(ItemsSourceTypeProperty); }
-            set { SetValue(ItemsSourceTypeProperty, value); }
-        }
-
-        public static readonly DependencyProperty NewItemTypesProperty = DependencyProperty.Register("NewItemTypes", typeof(IList), typeof(CollectionEditorDialog), new UIPropertyMetadata(null));
-        public IList<Type> NewItemTypes
-        {
-            get { return (IList<Type>)GetValue(NewItemTypesProperty); }
-            set { SetValue(NewItemTypesProperty, value); }
-        }
-
-        #endregion //Properties
-
-        #region Constructors
-
-        public CollectionEditorDialog()
-        {
-            InitializeComponent();
-        }
-
-        public CollectionEditorDialog(Type type)
-            : this()
-        {
-            ItemsSourceType = type;
-        }
-
-        #endregion //Constructors
-
-        #region Event Handlers
-
-        private void OkButton_Click(object sender, RoutedEventArgs e)
-        {
-            _propertyGrid.PersistChanges();
-            Close();
-        }
-
-        #endregion //Event Hanlders
+      get
+      {
+        return ( IList<Type> )GetValue( NewItemTypesProperty );
+      }
+      set
+      {
+        SetValue( NewItemTypesProperty, value );
+      }
     }
+
+    #endregion //Properties
+
+    #region Constructors
+
+    public CollectionEditorDialog()
+    {
+      InitializeComponent();
+    }
+
+    public CollectionEditorDialog( Type type )
+      : this()
+    {
+      ItemsSourceType = type;
+    }
+
+    #endregion //Constructors
+
+    #region Event Handlers
+
+    private void OkButton_Click( object sender, RoutedEventArgs e )
+    {
+      _propertyGrid.PersistChanges();
+      Close();
+    }
+
+    #endregion //Event Hanlders
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs
index 10c07819..9700f608 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Implementation/PrimitiveTypeCollectionEditor.cs
@@ -1,223 +1,271 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
 using System.Text;
 using System.Windows;
 using System.Windows.Controls;
-using System.Collections;
-using System.Reflection;
 
 namespace Microsoft.Windows.Controls
 {
-    public class PrimitiveTypeCollectionEditor : ContentControl
-    {
-        #region Members
+  public class PrimitiveTypeCollectionEditor : ContentControl
+  {
+    #region Members
 
-        bool _surpressTextChanged;
-        bool _conversionFailed;
+    bool _surpressTextChanged;
+    bool _conversionFailed;
 
-        #endregion //Members
+    #endregion //Members
 
-        #region Properties
+    #region Properties
 
-        #region IsOpen
+    #region IsOpen
 
-        public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register("IsOpen", typeof(bool), typeof(PrimitiveTypeCollectionEditor), new UIPropertyMetadata(false, OnIsOpenChanged));
-        public bool IsOpen
-        {
-            get { return (bool)GetValue(IsOpenProperty); }
-            set { SetValue(IsOpenProperty, value); }
-        }
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
 
-        private static void OnIsOpenChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PrimitiveTypeCollectionEditor primitiveTypeCollectionEditor = o as PrimitiveTypeCollectionEditor;
-            if (primitiveTypeCollectionEditor != null)
-                primitiveTypeCollectionEditor.OnIsOpenChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
+    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PrimitiveTypeCollectionEditor primitiveTypeCollectionEditor = o as PrimitiveTypeCollectionEditor;
+      if( primitiveTypeCollectionEditor != null )
+        primitiveTypeCollectionEditor.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
 
-        protected virtual void OnIsOpenChanged(bool oldValue, bool newValue)
-        {
+    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
+    {
 
-        }
+    }
 
-        #endregion //IsOpen
+    #endregion //IsOpen
 
-        #region ItemsSource
+    #region ItemsSource
 
-        public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register("ItemsSource", typeof(IList), typeof(PrimitiveTypeCollectionEditor), new UIPropertyMetadata(null, OnItemsSourceChanged));
-        public IList ItemsSource
-        {
-            get { return (IList)GetValue(ItemsSourceProperty); }
-            set { SetValue(ItemsSourceProperty, value); }
-        }
+    public static readonly DependencyProperty ItemsSourceProperty = DependencyProperty.Register( "ItemsSource", typeof( IList ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( null, OnItemsSourceChanged ) );
+    public IList ItemsSource
+    {
+      get
+      {
+        return ( IList )GetValue( ItemsSourceProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceProperty, value );
+      }
+    }
 
-        private static void OnItemsSourceChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PrimitiveTypeCollectionEditor primitiveTypeCollectionEditor = o as PrimitiveTypeCollectionEditor;
-            if (primitiveTypeCollectionEditor != null)
-                primitiveTypeCollectionEditor.OnItemsSourceChanged((IList)e.OldValue, (IList)e.NewValue);
-        }
+    private static void OnItemsSourceChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PrimitiveTypeCollectionEditor primitiveTypeCollectionEditor = o as PrimitiveTypeCollectionEditor;
+      if( primitiveTypeCollectionEditor != null )
+        primitiveTypeCollectionEditor.OnItemsSourceChanged( ( IList )e.OldValue, ( IList )e.NewValue );
+    }
 
-        protected virtual void OnItemsSourceChanged(IList oldValue, IList newValue)
-        {
-            if (newValue == null)
-                return;
+    protected virtual void OnItemsSourceChanged( IList oldValue, IList newValue )
+    {
+      if( newValue == null )
+        return;
 
-            if (ItemsSourceType == null)
-                ItemsSourceType = newValue.GetType();
+      if( ItemsSourceType == null )
+        ItemsSourceType = newValue.GetType();
 
-            if (ItemType == null)
-                ItemType = newValue.GetType().GetGenericArguments()[0];
+      if( ItemType == null )
+        ItemType = newValue.GetType().GetGenericArguments()[ 0 ];
 
-            if (newValue.Count > 0)
-                SetText(newValue);
-        }
+      if( newValue.Count > 0 )
+        SetText( newValue );
+    }
 
-        #endregion //ItemsSource
+    #endregion //ItemsSource
 
-        public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register("ItemsSourceType", typeof(Type), typeof(PrimitiveTypeCollectionEditor), new UIPropertyMetadata(null));
-        public Type ItemsSourceType
-        {
-            get { return (Type)GetValue(ItemsSourceTypeProperty); }
-            set { SetValue(ItemsSourceTypeProperty, value); }
-        }
+    public static readonly DependencyProperty ItemsSourceTypeProperty = DependencyProperty.Register( "ItemsSourceType", typeof( Type ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( null ) );
+    public Type ItemsSourceType
+    {
+      get
+      {
+        return ( Type )GetValue( ItemsSourceTypeProperty );
+      }
+      set
+      {
+        SetValue( ItemsSourceTypeProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty ItemTypeProperty = DependencyProperty.Register("ItemType", typeof(Type), typeof(PrimitiveTypeCollectionEditor), new UIPropertyMetadata(null));
-        public Type ItemType
-        {
-            get { return (Type)GetValue(ItemTypeProperty); }
-            set { SetValue(ItemTypeProperty, value); }
-        }
+    public static readonly DependencyProperty ItemTypeProperty = DependencyProperty.Register( "ItemType", typeof( Type ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( null ) );
+    public Type ItemType
+    {
+      get
+      {
+        return ( Type )GetValue( ItemTypeProperty );
+      }
+      set
+      {
+        SetValue( ItemTypeProperty, value );
+      }
+    }
 
-        #region Text
+    #region Text
 
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(PrimitiveTypeCollectionEditor), new UIPropertyMetadata(null, OnTextChanged));
-        public string Text
-        {
-            get { return (string)GetValue(TextProperty); }
-            set { SetValue(TextProperty, value); }
-        }
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( PrimitiveTypeCollectionEditor ), new UIPropertyMetadata( null, OnTextChanged ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
 
-        private static void OnTextChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PrimitiveTypeCollectionEditor primitiveTypeCollectionEditor = o as PrimitiveTypeCollectionEditor;
-            if (primitiveTypeCollectionEditor != null)
-                primitiveTypeCollectionEditor.OnTextChanged((string)e.OldValue, (string)e.NewValue);
-        }
+    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PrimitiveTypeCollectionEditor primitiveTypeCollectionEditor = o as PrimitiveTypeCollectionEditor;
+      if( primitiveTypeCollectionEditor != null )
+        primitiveTypeCollectionEditor.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
 
-        protected virtual void OnTextChanged(string oldValue, string newValue)
-        {
-            if (!_surpressTextChanged)
-                PersistChanges();
-        }
+    protected virtual void OnTextChanged( string oldValue, string newValue )
+    {
+      if( !_surpressTextChanged )
+        PersistChanges();
+    }
 
-        #endregion //Text   
+    #endregion //Text
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region Constructors
+    #region Constructors
 
-        static PrimitiveTypeCollectionEditor()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(PrimitiveTypeCollectionEditor), new FrameworkPropertyMetadata(typeof(PrimitiveTypeCollectionEditor)));
-        }
+    static PrimitiveTypeCollectionEditor()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( PrimitiveTypeCollectionEditor ), new FrameworkPropertyMetadata( typeof( PrimitiveTypeCollectionEditor ) ) );
+    }
 
-        public PrimitiveTypeCollectionEditor()
-        {
+    public PrimitiveTypeCollectionEditor()
+    {
 
-        }
+    }
 
-        #endregion //Constructors
+    #endregion //Constructors
 
-        #region Methods
+    #region Methods
 
-        private void PersistChanges()
-        {
-            IList list = ResolveItemsSource();
-            if (list == null)
-                return;
-
-            //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();
-
-            IList items = ResolveItems();
-            foreach (var item in items)
-            {
-                list.Add(item);
-            };
-
-            // if something went wrong during conversion we want to reload the text to show only valid entries
-            if (_conversionFailed)
-                SetText(list);
-        }
+    private void PersistChanges()
+    {
+      IList list = ResolveItemsSource();
+      if( list == null )
+        return;
+
+      //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();
+
+      IList items = ResolveItems();
+      foreach( var item in items )
+      {
+        list.Add( item );
+      };
+
+      // if something went wrong during conversion we want to reload the text to show only valid entries
+      if( _conversionFailed )
+        SetText( list );
+    }
+
+    private IList ResolveItems()
+    {
+      IList items = new List<object>();
 
-        private IList ResolveItems()
+      if( ItemType == null )
+        return items;
+
+      string[] textArray = Text.Split( '\n' );
+
+      foreach( string s in textArray )
+      {
+        string valueString = s.TrimEnd( '\r' );
+        if( !String.IsNullOrEmpty( valueString ) )
         {
-            IList items = new List<object>();
-
-            if (ItemType == null)
-                return items;
-
-            string[] textArray = Text.Split('\n');
-
-            foreach (string s in textArray)
-            {
-                string valueString = s.TrimEnd('\r');
-                if (!String.IsNullOrEmpty(valueString))
-                {
-                    object value = null;
-                    try
-                    {
-                        value = Convert.ChangeType(valueString, ItemType);
-                    }
-                    catch
-                    {
-                        //a conversion failed
-                        _conversionFailed = true;
-                    }
-
-                    if (value != null)
-                        items.Add(value);
-                }
-            }
-
-            return items;
+          object value = null;
+          try
+          {
+            value = Convert.ChangeType( valueString, ItemType );
+          }
+          catch
+          {
+            //a conversion failed
+            _conversionFailed = true;
+          }
+
+          if( value != null )
+            items.Add( value );
         }
+      }
 
-        private IList ResolveItemsSource()
-        {
-            if (ItemsSource == null)
-                ItemsSource = CreateItemsSource();
+      return items;
+    }
 
-            return ItemsSource;
-        }
+    private IList ResolveItemsSource()
+    {
+      if( ItemsSource == null )
+        ItemsSource = CreateItemsSource();
 
-        private IList CreateItemsSource()
-        {
-            IList list = null;
+      return ItemsSource;
+    }
 
-            if (ItemsSourceType != null)
-            {
-                ConstructorInfo constructor = ItemsSourceType.GetConstructor(Type.EmptyTypes);
-                list = (IList)constructor.Invoke(null);
-            }
+    private IList CreateItemsSource()
+    {
+      IList list = null;
 
-            return list;
-        }
+      if( ItemsSourceType != null )
+      {
+        ConstructorInfo constructor = ItemsSourceType.GetConstructor( Type.EmptyTypes );
+        list = ( IList )constructor.Invoke( null );
+      }
 
-        private void SetText(IEnumerable collection)
-        {
-            _surpressTextChanged = true;
-            StringBuilder builder = new StringBuilder();
-            foreach (object obj2 in collection)
-            {
-                builder.Append(obj2.ToString());
-                builder.AppendLine();
-            }
-            Text = builder.ToString().Trim();
-            _surpressTextChanged = false;
-        }
+      return list;
+    }
 
-        #endregion //Methods
+    private void SetText( IEnumerable collection )
+    {
+      _surpressTextChanged = true;
+      StringBuilder builder = new StringBuilder();
+      foreach( object obj2 in collection )
+      {
+        builder.Append( obj2.ToString() );
+        builder.AppendLine();
+      }
+      Text = builder.ToString().Trim();
+      _surpressTextChanged = false;
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml
index 5ff92334..64c2e5e0 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml
@@ -1,126 +1,162 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:propertyGrid="clr-namespace:Microsoft.Windows.Controls.PropertyGrid">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-    <coreConverters:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
-
-    <Style x:Key="CollectionEditorButtonStyle" TargetType="{x:Type Button}">
-        <Style.Triggers>
-            <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" Value="0.6" />
-            </Trigger>
-        </Style.Triggers>
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Height" Value="26" />
-        <Setter Property="Width" Value="26" />
-    </Style>
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <coreConverters:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
 
-    <Style TargetType="{x:Type local:CollectionEditor}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:CollectionEditor}">
-                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="1.5*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <TextBlock Margin="0,0,0,5" Text="Select type:" />
-                                <ComboBox x:Name="_newItemTypes" Grid.Row="1" Margin="0,0,0,3" HorizontalAlignment="Stretch"
-                                          ItemsSource="{Binding NewItemTypes, RelativeSource={RelativeSource TemplatedParent}}"
-                                          DisplayMemberPath="Name"
-                                          SelectedIndex="0"/>
-                                <Button Margin="3,0,0,3" Grid.Row="1" Grid.Column="1" Padding="5,0" Content="Add" 
-                                        Command="New" CommandParameter="{Binding SelectedItem, ElementName=_newItemTypes}"  />
-                                <ListBox x:Name="_itemsListBox" Grid.Row="2" Grid.ColumnSpan="2"
-                                         ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
-                                         SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                         SelectedIndex="0">
-                                    <ListBox.ItemTemplate>
-                                        <DataTemplate>
-                                            <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-                                        </DataTemplate>
-                                    </ListBox.ItemTemplate>
-                                </ListBox>
-                                <StackPanel Margin="7,2,0,0" VerticalAlignment="Top" Grid.Column="2" Grid.Row="2">
-                                    <Button Style="{StaticResource CollectionEditorButtonStyle}"
-                                            Command="ComponentCommands.MoveUp" CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
-                                        <Path Fill="#FF404040" Data="F0 M 6,0 L 12,7 8,7 8,12 4,12 4,7 0,7 Z" />
-                                    </Button>
-                                    <Button Margin="0,1,0,0" Style="{StaticResource CollectionEditorButtonStyle}"
-                                            Command="ComponentCommands.MoveDown" CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
-                                        <Path Fill="#FF404040" Data="F0 M 4,0 L 8,0 8,5 12,5 6,12 0,5 4,5 Z" />
-                                    </Button>
-                                    <Button Margin="0,7,0,0" Style="{StaticResource CollectionEditorButtonStyle}"
-                                            Command="Delete" CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
-                                        <Image Stretch="None" Height="16" Width="16" Margin="1" Source="/WPFToolkit.Extended;component/CollectionEditors/Images/Delete16.png" />
-                                    </Button>
-                                </StackPanel>
-                            </Grid>
-                            <Grid Column="1" Margin="20,0,0,0">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <TextBlock Grid.Column="1" Text="Properties:" />
-                                <propertyGrid:PropertyGrid Grid.Row="1" Grid.Column="1" Margin="0,5,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                                                           SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            </Grid>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style x:Key="CollectionEditorButtonStyle" TargetType="{x:Type Button}">
+      <Style.Triggers>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="Opacity" Value="0.6" />
+         </Trigger>
+      </Style.Triggers>
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Height" Value="26" />
+      <Setter Property="Width" Value="26" />
+   </Style>
 
+   <Style TargetType="{x:Type local:CollectionEditor}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CollectionEditor}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="1.5*" />
+                     </Grid.ColumnDefinitions>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition />
+                           <ColumnDefinition Width="Auto" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <TextBlock Margin="0,0,0,5" Text="Select type:" />
+                        <ComboBox x:Name="_newItemTypes"
+                                  Grid.Row="1"
+                                  Margin="0,0,0,3"
+                                  HorizontalAlignment="Stretch"
+                                  ItemsSource="{Binding NewItemTypes, RelativeSource={RelativeSource TemplatedParent}}"
+                                  DisplayMemberPath="Name"
+                                  SelectedIndex="0" />
+                        <Button Margin="3,0,0,3"
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Padding="5,0"
+                                Content="Add" 
+                                Command="New"
+                                CommandParameter="{Binding SelectedItem, ElementName=_newItemTypes}" />
+                        <ListBox x:Name="_itemsListBox"
+                                 Grid.Row="2"
+                                 Grid.ColumnSpan="2"
+                                 ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
+                                 SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                 SelectedIndex="0">
+                           <ListBox.ItemTemplate>
+                              <DataTemplate>
+                                 <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
+                              </DataTemplate>
+                           </ListBox.ItemTemplate>
+                        </ListBox>
+                        <StackPanel Margin="7,2,0,0" VerticalAlignment="Top" Grid.Column="2" Grid.Row="2">
+                           <Button Style="{StaticResource CollectionEditorButtonStyle}"
+                                   Command="ComponentCommands.MoveUp"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                              <Path Fill="#FF404040" Data="F0 M 6,0 L 12,7 8,7 8,12 4,12 4,7 0,7 Z" />
+                           </Button>
+                           <Button Margin="0,1,0,0"
+                                   Style="{StaticResource CollectionEditorButtonStyle}"
+                                   Command="ComponentCommands.MoveDown"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                              <Path Fill="#FF404040" Data="F0 M 4,0 L 8,0 8,5 12,5 6,12 0,5 4,5 Z" />
+                           </Button>
+                           <Button Margin="0,7,0,0"
+                                   Style="{StaticResource CollectionEditorButtonStyle}"
+                                   Command="Delete"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                              <Image Stretch="None" Height="16" Width="16" Margin="1" Source="/WPFToolkit.Extended;component/CollectionEditors/Images/Delete16.png" />
+                           </Button>
+                        </StackPanel>
+                     </Grid>
+                     <Grid Column="1" Margin="20,0,0,0">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <TextBlock Grid.Column="1" Text="Properties:" />
+                        <propertyGrid:PropertyGrid Grid.Row="1"
+                                                   Grid.Column="1"
+                                                   Margin="0,5,0,0"
+                                                   HorizontalAlignment="Stretch"
+                                                   VerticalAlignment="Stretch"
+                                                   SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}" />
+                     </Grid>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
-    <Style TargetType="{x:Type local:PrimitiveTypeCollectionEditor}">
-        <Setter Property="BorderBrush">
-            <Setter.Value>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="#FFA3AEB9" Offset="0" />
-                    <GradientStop Color="#FF8399A9" Offset="0.375" />
-                    <GradientStop Color="#FF718597" Offset="0.375" />
-                    <GradientStop Color="#FF617584" Offset="1" />
-                </LinearGradientBrush>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="1,1,0,1" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Padding" Value="2,0,0,0" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:PrimitiveTypeCollectionEditor}">
-                    <local:MultiLineTextEditor Background="{TemplateBinding Background}"
-                                               BorderBrush="{TemplateBinding BorderBrush}"
-                                               BorderThickness="{TemplateBinding BorderThickness}"
-                                               Content="{TemplateBinding Content}"  
-                                               Padding="{TemplateBinding Padding}"
-                                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                               IsOpen="{TemplateBinding IsOpen}"
-                                               Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                               VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style TargetType="{x:Type local:PrimitiveTypeCollectionEditor}">
+      <Setter Property="BorderBrush">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+               <GradientStop Color="#FFA3AEB9" Offset="0" />
+               <GradientStop Color="#FF8399A9" Offset="0.375" />
+               <GradientStop Color="#FF718597" Offset="0.375" />
+               <GradientStop Color="#FF617584" Offset="1" />
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Padding" Value="2,0,0,0" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:PrimitiveTypeCollectionEditor}">
+               <local:MultiLineTextEditor Background="{TemplateBinding Background}"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          Content="{TemplateBinding Content}"  
+                                          Padding="{TemplateBinding Padding}"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsOpen="{TemplateBinding IsOpen}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs
index ff10b72d..808c2fec 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorCanvas.cs
@@ -1,384 +1,447 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Media;
-using Microsoft.Windows.Controls.Primitives;
 using Microsoft.Windows.Controls.Core.Utilities;
-using System.Windows.Data;
+using Microsoft.Windows.Controls.Primitives;
 
 namespace Microsoft.Windows.Controls
 {
-    public class ColorCanvas : Control
-    {
-        #region Private Members
+  public class ColorCanvas : Control
+  {
+    #region Private Members
 
-        private TranslateTransform _colorShadeSelectorTransform = new TranslateTransform();
-        private Canvas _colorShadingCanvas;
-        private Canvas _colorShadeSelector;
-        private ColorSpectrumSlider _spectrumSlider;
-        private Point? _currentColorPosition;
-        private bool _surpressPropertyChanged;
+    private TranslateTransform _colorShadeSelectorTransform = new TranslateTransform();
+    private Canvas _colorShadingCanvas;
+    private Canvas _colorShadeSelector;
+    private ColorSpectrumSlider _spectrumSlider;
+    private Point? _currentColorPosition;
+    private bool _surpressPropertyChanged;
 
-        #endregion //Private Members
+    #endregion //Private Members
 
-        #region Properties
+    #region Properties
 
-        #region SelectedColor
+    #region SelectedColor
 
-        public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register("SelectedColor", typeof(Color), typeof(ColorCanvas), new FrameworkPropertyMetadata(Colors.Black, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedColorChanged));
-        public Color SelectedColor
-        {
-            get { return (Color)GetValue(SelectedColorProperty); }
-            set { SetValue(SelectedColorProperty, value); }
-        }
+    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color ), typeof( ColorCanvas ), new FrameworkPropertyMetadata( Colors.Black, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedColorChanged ) );
+    public Color SelectedColor
+    {
+      get
+      {
+        return ( Color )GetValue( SelectedColorProperty );
+      }
+      set
+      {
+        SetValue( SelectedColorProperty, value );
+      }
+    }
 
-        private static void OnSelectedColorChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ColorCanvas colorCanvas = o as ColorCanvas;
-            if (colorCanvas != null)
-                colorCanvas.OnSelectedColorChanged((Color)e.OldValue, (Color)e.NewValue);
-        }
+    private static void OnSelectedColorChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnSelectedColorChanged( ( Color )e.OldValue, ( Color )e.NewValue );
+    }
 
-        protected virtual void OnSelectedColorChanged(Color oldValue, Color newValue)
-        {
-            HexadecimalString = newValue.ToString();
-            UpdateRGBValues(newValue);
-            UpdateColorShadeSelectorPosition(newValue);
+    protected virtual void OnSelectedColorChanged( Color oldValue, Color newValue )
+    {
+      HexadecimalString = newValue.ToString();
+      UpdateRGBValues( newValue );
+      UpdateColorShadeSelectorPosition( newValue );
 
-            RoutedPropertyChangedEventArgs<Color> args = new RoutedPropertyChangedEventArgs<Color>(oldValue, newValue);
-            args.RoutedEvent = SelectedColorChangedEvent;
-            RaiseEvent(args);
-        }
+      RoutedPropertyChangedEventArgs<Color> args = new RoutedPropertyChangedEventArgs<Color>( oldValue, newValue );
+      args.RoutedEvent = SelectedColorChangedEvent;
+      RaiseEvent( args );
+    }
 
-        #endregion //SelectedColor
+    #endregion //SelectedColor
 
-        #region RGB
+    #region RGB
 
-        #region A
+    #region A
 
-        public static readonly DependencyProperty AProperty = DependencyProperty.Register("A", typeof(byte), typeof(ColorCanvas), new UIPropertyMetadata((byte)255, OnAChanged));
-        public byte A
-        {
-            get { return (byte)GetValue(AProperty); }
-            set { SetValue(AProperty, value); }
-        }
+    public static readonly DependencyProperty AProperty = DependencyProperty.Register( "A", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )255, OnAChanged ) );
+    public byte A
+    {
+      get
+      {
+        return ( byte )GetValue( AProperty );
+      }
+      set
+      {
+        SetValue( AProperty, value );
+      }
+    }
 
-        private static void OnAChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ColorCanvas colorCanvas = o as ColorCanvas;
-            if (colorCanvas != null)
-                colorCanvas.OnAChanged((byte)e.OldValue, (byte)e.NewValue);
-        }
+    private static void OnAChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnAChanged( ( byte )e.OldValue, ( byte )e.NewValue );
+    }
 
-        protected virtual void OnAChanged(byte oldValue, byte newValue)
-        {
-            if (!_surpressPropertyChanged)
-                UpdateSelectedColor();
-        }
+    protected virtual void OnAChanged( byte oldValue, byte newValue )
+    {
+      if( !_surpressPropertyChanged )
+        UpdateSelectedColor();
+    }
 
-        #endregion //A
+    #endregion //A
 
-        #region R
+    #region R
 
-        public static readonly DependencyProperty RProperty = DependencyProperty.Register("R", typeof(byte), typeof(ColorCanvas), new UIPropertyMetadata((byte)0, OnRChanged));
-        public byte R
-        {
-            get { return (byte)GetValue(RProperty); }
-            set { SetValue(RProperty, value); }
-        }
+    public static readonly DependencyProperty RProperty = DependencyProperty.Register( "R", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnRChanged ) );
+    public byte R
+    {
+      get
+      {
+        return ( byte )GetValue( RProperty );
+      }
+      set
+      {
+        SetValue( RProperty, value );
+      }
+    }
 
-        private static void OnRChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ColorCanvas colorCanvas = o as ColorCanvas;
-            if (colorCanvas != null)
-                colorCanvas.OnRChanged((byte)e.OldValue, (byte)e.NewValue);
-        }
+    private static void OnRChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnRChanged( ( byte )e.OldValue, ( byte )e.NewValue );
+    }
 
-        protected virtual void OnRChanged(byte oldValue, byte newValue)
-        {
-            if (!_surpressPropertyChanged)
-                UpdateSelectedColor();
-        }
+    protected virtual void OnRChanged( byte oldValue, byte newValue )
+    {
+      if( !_surpressPropertyChanged )
+        UpdateSelectedColor();
+    }
 
-        #endregion //R
+    #endregion //R
 
-        #region G
+    #region G
 
-        public static readonly DependencyProperty GProperty = DependencyProperty.Register("G", typeof(byte), typeof(ColorCanvas), new UIPropertyMetadata((byte)0, OnGChanged));
-        public byte G
-        {
-            get { return (byte)GetValue(GProperty); }
-            set { SetValue(GProperty, value); }
-        }
+    public static readonly DependencyProperty GProperty = DependencyProperty.Register( "G", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnGChanged ) );
+    public byte G
+    {
+      get
+      {
+        return ( byte )GetValue( GProperty );
+      }
+      set
+      {
+        SetValue( GProperty, value );
+      }
+    }
 
-        private static void OnGChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ColorCanvas colorCanvas = o as ColorCanvas;
-            if (colorCanvas != null)
-                colorCanvas.OnGChanged((byte)e.OldValue, (byte)e.NewValue);
-        }
+    private static void OnGChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnGChanged( ( byte )e.OldValue, ( byte )e.NewValue );
+    }
 
-        protected virtual void OnGChanged(byte oldValue, byte newValue)
-        {
-            if (!_surpressPropertyChanged)
-                UpdateSelectedColor();
-        }
+    protected virtual void OnGChanged( byte oldValue, byte newValue )
+    {
+      if( !_surpressPropertyChanged )
+        UpdateSelectedColor();
+    }
 
-        #endregion //G
+    #endregion //G
 
-        #region B
+    #region B
 
-        public static readonly DependencyProperty BProperty = DependencyProperty.Register("B", typeof(byte), typeof(ColorCanvas), new UIPropertyMetadata((byte)0, OnBChanged));
-        public byte B
-        {
-            get { return (byte)GetValue(BProperty); }
-            set { SetValue(BProperty, value); }
-        }
+    public static readonly DependencyProperty BProperty = DependencyProperty.Register( "B", typeof( byte ), typeof( ColorCanvas ), new UIPropertyMetadata( ( byte )0, OnBChanged ) );
+    public byte B
+    {
+      get
+      {
+        return ( byte )GetValue( BProperty );
+      }
+      set
+      {
+        SetValue( BProperty, value );
+      }
+    }
 
-        private static void OnBChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ColorCanvas colorCanvas = o as ColorCanvas;
-            if (colorCanvas != null)
-                colorCanvas.OnBChanged((byte)e.OldValue, (byte)e.NewValue);
-        }
+    private static void OnBChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnBChanged( ( byte )e.OldValue, ( byte )e.NewValue );
+    }
 
-        protected virtual void OnBChanged(byte oldValue, byte newValue)
-        {
-            if (!_surpressPropertyChanged)
-                UpdateSelectedColor();
-        }
+    protected virtual void OnBChanged( byte oldValue, byte newValue )
+    {
+      if( !_surpressPropertyChanged )
+        UpdateSelectedColor();
+    }
 
-        #endregion //B
+    #endregion //B
 
-        #endregion //RGB
+    #endregion //RGB
 
-        #region HexadecimalString
+    #region HexadecimalString
 
-        public static readonly DependencyProperty HexadecimalStringProperty = DependencyProperty.Register("HexadecimalString", typeof(string), typeof(ColorCanvas), new UIPropertyMetadata("#FFFFFFFF", OnHexadecimalStringChanged));
-        public string HexadecimalString
-        {
-            get { return (string)GetValue(HexadecimalStringProperty); }
-            set { SetValue(HexadecimalStringProperty, value); }
-        }
+    public static readonly DependencyProperty HexadecimalStringProperty = DependencyProperty.Register( "HexadecimalString", typeof( string ), typeof( ColorCanvas ), new UIPropertyMetadata( "#FFFFFFFF", OnHexadecimalStringChanged ) );
+    public string HexadecimalString
+    {
+      get
+      {
+        return ( string )GetValue( HexadecimalStringProperty );
+      }
+      set
+      {
+        SetValue( HexadecimalStringProperty, value );
+      }
+    }
 
-        private static void OnHexadecimalStringChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            ColorCanvas colorCanvas = o as ColorCanvas;
-            if (colorCanvas != null)
-                colorCanvas.OnHexadecimalStringChanged((string)e.OldValue, (string)e.NewValue);
-        }
+    private static void OnHexadecimalStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      ColorCanvas colorCanvas = o as ColorCanvas;
+      if( colorCanvas != null )
+        colorCanvas.OnHexadecimalStringChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
 
-        protected virtual void OnHexadecimalStringChanged(string oldValue, string newValue)
-        {
-            if (!SelectedColor.ToString().Equals(newValue))
-                UpdateSelectedColor((Color)ColorConverter.ConvertFromString(newValue));
-        }
+    protected virtual void OnHexadecimalStringChanged( string oldValue, string newValue )
+    {
+      if( !SelectedColor.ToString().Equals( newValue ) )
+        UpdateSelectedColor( ( Color )ColorConverter.ConvertFromString( newValue ) );
+    }
 
-        #endregion //HexadecimalString
+    #endregion //HexadecimalString
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region Constructors
+    #region Constructors
 
-        static ColorCanvas()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(ColorCanvas), new FrameworkPropertyMetadata(typeof(ColorCanvas)));
-        }
+    static ColorCanvas()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorCanvas ), new FrameworkPropertyMetadata( typeof( ColorCanvas ) ) );
+    }
 
-        #endregion //Constructors
+    #endregion //Constructors
 
-        #region Base Class Overrides
+    #region Base Class Overrides
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-            if (_colorShadingCanvas != null)
-            {
-                _colorShadingCanvas.MouseLeftButtonDown -= ColorShadingCanvas_MouseLeftButtonDown;
-                _colorShadingCanvas.MouseLeftButtonUp -= ColorShadingCanvas_MouseLeftButtonUp;
-                _colorShadingCanvas.MouseMove -= ColorShadingCanvas_MouseMove;
-                _colorShadingCanvas.SizeChanged -= ColorShadingCanvas_SizeChanged;
-            }
+      if( _colorShadingCanvas != null )
+      {
+        _colorShadingCanvas.MouseLeftButtonDown -= ColorShadingCanvas_MouseLeftButtonDown;
+        _colorShadingCanvas.MouseLeftButtonUp -= ColorShadingCanvas_MouseLeftButtonUp;
+        _colorShadingCanvas.MouseMove -= ColorShadingCanvas_MouseMove;
+        _colorShadingCanvas.SizeChanged -= ColorShadingCanvas_SizeChanged;
+      }
 
-            _colorShadingCanvas = GetTemplateChild("PART_ColorShadingCanvas") as Canvas;
+      _colorShadingCanvas = GetTemplateChild( "PART_ColorShadingCanvas" ) as Canvas;
 
-            if (_colorShadingCanvas != null)
-            {
-                _colorShadingCanvas.MouseLeftButtonDown += ColorShadingCanvas_MouseLeftButtonDown;
-                _colorShadingCanvas.MouseLeftButtonUp += ColorShadingCanvas_MouseLeftButtonUp;
-                _colorShadingCanvas.MouseMove += ColorShadingCanvas_MouseMove;
-                _colorShadingCanvas.SizeChanged += ColorShadingCanvas_SizeChanged;
-            }
+      if( _colorShadingCanvas != null )
+      {
+        _colorShadingCanvas.MouseLeftButtonDown += ColorShadingCanvas_MouseLeftButtonDown;
+        _colorShadingCanvas.MouseLeftButtonUp += ColorShadingCanvas_MouseLeftButtonUp;
+        _colorShadingCanvas.MouseMove += ColorShadingCanvas_MouseMove;
+        _colorShadingCanvas.SizeChanged += ColorShadingCanvas_SizeChanged;
+      }
 
-            _colorShadeSelector = GetTemplateChild("PART_ColorShadeSelector") as Canvas;
+      _colorShadeSelector = GetTemplateChild( "PART_ColorShadeSelector" ) as Canvas;
 
-            if (_colorShadeSelector != null)
-                _colorShadeSelector.RenderTransform = _colorShadeSelectorTransform;
+      if( _colorShadeSelector != null )
+        _colorShadeSelector.RenderTransform = _colorShadeSelectorTransform;
 
-            if (_spectrumSlider != null)
-                _spectrumSlider.ValueChanged -= SpectrumSlider_ValueChanged;
-            
-            _spectrumSlider = GetTemplateChild("PART_SpectrumSlider") as ColorSpectrumSlider;
+      if( _spectrumSlider != null )
+        _spectrumSlider.ValueChanged -= SpectrumSlider_ValueChanged;
 
-            if (_spectrumSlider != null)
-                _spectrumSlider.ValueChanged += SpectrumSlider_ValueChanged;            
+      _spectrumSlider = GetTemplateChild( "PART_SpectrumSlider" ) as ColorSpectrumSlider;
 
-            UpdateRGBValues(SelectedColor);
-            UpdateColorShadeSelectorPosition(SelectedColor);
-        }
+      if( _spectrumSlider != null )
+        _spectrumSlider.ValueChanged += SpectrumSlider_ValueChanged;
 
-        protected override void OnPreviewKeyDown(KeyEventArgs e)
-        {
-            //hitting enter on textbox will update value of underlying source
-            if (e.Key == Key.Enter && e.OriginalSource is TextBox)
-            {
-                BindingExpression be = ((TextBox)e.OriginalSource).GetBindingExpression(TextBox.TextProperty);
-                be.UpdateSource();
-            }
-        }
+      UpdateRGBValues( SelectedColor );
+      UpdateColorShadeSelectorPosition( SelectedColor );
+    }
 
-        #endregion //Base Class Overrides
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      //hitting enter on textbox will update value of underlying source
+      if( e.Key == Key.Enter && e.OriginalSource is TextBox )
+      {
+        BindingExpression be = ( ( TextBox )e.OriginalSource ).GetBindingExpression( TextBox.TextProperty );
+        be.UpdateSource();
+      }
+    }
 
-        #region Event Handlers
+    #endregion //Base Class Overrides
 
-        void ColorShadingCanvas_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            Point p = e.GetPosition(_colorShadingCanvas);
-            UpdateColorShadeSelectorPositionAndCalculateColor(p, true);
-            _colorShadingCanvas.CaptureMouse();
-        }
+    #region Event Handlers
 
-        void ColorShadingCanvas_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            _colorShadingCanvas.ReleaseMouseCapture();
-        }
+    void ColorShadingCanvas_MouseLeftButtonDown( object sender, MouseButtonEventArgs e )
+    {
+      Point p = e.GetPosition( _colorShadingCanvas );
+      UpdateColorShadeSelectorPositionAndCalculateColor( p, true );
+      _colorShadingCanvas.CaptureMouse();
+    }
 
-        void ColorShadingCanvas_MouseMove(object sender, MouseEventArgs e)
-        {
-            if (e.LeftButton == MouseButtonState.Pressed)
-            {
-                Point p = e.GetPosition(_colorShadingCanvas);
-                UpdateColorShadeSelectorPositionAndCalculateColor(p, true);
-                Mouse.Synchronize();
-            }
-        }
-
-        void ColorShadingCanvas_SizeChanged(object sender, SizeChangedEventArgs e)
-        {
-            if (_currentColorPosition != null)
-            {
-                Point _newPoint = new Point
-                {
-                    X = ((Point)_currentColorPosition).X * e.NewSize.Width,
-                    Y = ((Point)_currentColorPosition).Y * e.NewSize.Height
-                };
-
-                UpdateColorShadeSelectorPositionAndCalculateColor(_newPoint, false);
-            }
-        }
-
-        void SpectrumSlider_ValueChanged(object sender, RoutedPropertyChangedEventArgs<double> e)
+    void ColorShadingCanvas_MouseLeftButtonUp( object sender, MouseButtonEventArgs e )
+    {
+      _colorShadingCanvas.ReleaseMouseCapture();
+    }
+
+    void ColorShadingCanvas_MouseMove( object sender, MouseEventArgs e )
+    {
+      if( e.LeftButton == MouseButtonState.Pressed )
+      {
+        Point p = e.GetPosition( _colorShadingCanvas );
+        UpdateColorShadeSelectorPositionAndCalculateColor( p, true );
+        Mouse.Synchronize();
+      }
+    }
+
+    void ColorShadingCanvas_SizeChanged( object sender, SizeChangedEventArgs e )
+    {
+      if( _currentColorPosition != null )
+      {
+        Point _newPoint = new Point
         {
-            if (_currentColorPosition != null)
-            {
-                CalculateColor((Point)_currentColorPosition);
-            }
-        }
+          X = ( ( Point )_currentColorPosition ).X * e.NewSize.Width,
+          Y = ( ( Point )_currentColorPosition ).Y * e.NewSize.Height
+        };
 
-        #endregion //Event Handlers
+        UpdateColorShadeSelectorPositionAndCalculateColor( _newPoint, false );
+      }
+    }
 
-        #region Events
+    void SpectrumSlider_ValueChanged( object sender, RoutedPropertyChangedEventArgs<double> e )
+    {
+      if( _currentColorPosition != null )
+      {
+        CalculateColor( ( Point )_currentColorPosition );
+      }
+    }
 
-        public static readonly RoutedEvent SelectedColorChangedEvent = EventManager.RegisterRoutedEvent("SelectedColorChanged", RoutingStrategy.Bubble, typeof(RoutedPropertyChangedEventHandler<Color>), typeof(ColorCanvas));
-        public event RoutedPropertyChangedEventHandler<Color> SelectedColorChanged
-        {
-            add { AddHandler(SelectedColorChangedEvent, value); }
-            remove { RemoveHandler(SelectedColorChangedEvent, value); }
-        }
+    #endregion //Event Handlers
 
-        #endregion //Events
+    #region Events
 
-        #region Methods
+    public static readonly RoutedEvent SelectedColorChangedEvent = EventManager.RegisterRoutedEvent( "SelectedColorChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<Color> ), typeof( ColorCanvas ) );
+    public event RoutedPropertyChangedEventHandler<Color> SelectedColorChanged
+    {
+      add
+      {
+        AddHandler( SelectedColorChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( SelectedColorChangedEvent, value );
+      }
+    }
 
-        private void UpdateSelectedColor()
-        {
-            SelectedColor = Color.FromArgb(A, R, G, B);
-        }
+    #endregion //Events
 
-        private void UpdateSelectedColor(Color color)
-        {
-            SelectedColor = Color.FromArgb(color.A, color.R, color.G, color.B);
-        }
+    #region Methods
 
-        private void UpdateRGBValues(Color color)
-        {
-            _surpressPropertyChanged = true;
+    private void UpdateSelectedColor()
+    {
+      SelectedColor = Color.FromArgb( A, R, G, B );
+    }
 
-            A = color.A;
-            R = color.R;
-            G = color.G;
-            B = color.B;
+    private void UpdateSelectedColor( Color color )
+    {
+      SelectedColor = Color.FromArgb( color.A, color.R, color.G, color.B );
+    }
 
-            _surpressPropertyChanged = false;
-        }
+    private void UpdateRGBValues( Color color )
+    {
+      _surpressPropertyChanged = true;
 
-        private void UpdateColorShadeSelectorPositionAndCalculateColor(Point p, bool calculateColor)
-        {
-            if (p.Y < 0)
-                p.Y = 0;
+      A = color.A;
+      R = color.R;
+      G = color.G;
+      B = color.B;
 
-            if (p.X < 0)
-                p.X = 0;
+      _surpressPropertyChanged = false;
+    }
 
-            if (p.X > _colorShadingCanvas.ActualWidth)
-                p.X = _colorShadingCanvas.ActualWidth;
+    private void UpdateColorShadeSelectorPositionAndCalculateColor( Point p, bool calculateColor )
+    {
+      if( p.Y < 0 )
+        p.Y = 0;
 
-            if (p.Y > _colorShadingCanvas.ActualHeight)
-                p.Y = _colorShadingCanvas.ActualHeight;
+      if( p.X < 0 )
+        p.X = 0;
 
-            _colorShadeSelectorTransform.X = p.X - (_colorShadeSelector.Width / 2);
-            _colorShadeSelectorTransform.Y = p.Y - (_colorShadeSelector.Height / 2);
+      if( p.X > _colorShadingCanvas.ActualWidth )
+        p.X = _colorShadingCanvas.ActualWidth;
 
-            p.X = p.X / _colorShadingCanvas.ActualWidth;
-            p.Y = p.Y / _colorShadingCanvas.ActualHeight;
+      if( p.Y > _colorShadingCanvas.ActualHeight )
+        p.Y = _colorShadingCanvas.ActualHeight;
 
-            _currentColorPosition = p;
+      _colorShadeSelectorTransform.X = p.X - ( _colorShadeSelector.Width / 2 );
+      _colorShadeSelectorTransform.Y = p.Y - ( _colorShadeSelector.Height / 2 );
 
-            if (calculateColor)
-                CalculateColor(p);
-        }
+      p.X = p.X / _colorShadingCanvas.ActualWidth;
+      p.Y = p.Y / _colorShadingCanvas.ActualHeight;
 
-        private void UpdateColorShadeSelectorPosition(Color color)
-        {
-            if (_spectrumSlider == null || _colorShadingCanvas == null)
-                return;
+      _currentColorPosition = p;
 
-            _currentColorPosition = null;
+      if( calculateColor )
+        CalculateColor( p );
+    }
 
-            HsvColor hsv = ColorUtilities.ConvertRgbToHsv(color.R, color.G, color.B);
+    private void UpdateColorShadeSelectorPosition( Color color )
+    {
+      if( _spectrumSlider == null || _colorShadingCanvas == null )
+        return;
 
-            if (!(color.R == color.G && color.R == color.B))
-                _spectrumSlider.Value = hsv.H;
+      _currentColorPosition = null;
 
-            Point p = new Point(hsv.S, 1 - hsv.V);
+      HsvColor hsv = ColorUtilities.ConvertRgbToHsv( color.R, color.G, color.B );
 
-            _currentColorPosition = p;
+      if( !( color.R == color.G && color.R == color.B ) )
+        _spectrumSlider.Value = hsv.H;
 
-            _colorShadeSelectorTransform.X = (p.X * _colorShadingCanvas.Width) - 5;
-            _colorShadeSelectorTransform.Y = (p.Y * _colorShadingCanvas.Height) - 5;
-        }
+      Point p = new Point( hsv.S, 1 - hsv.V );
 
-        private void CalculateColor(Point p)
-        {
-            HsvColor hsv = new HsvColor(360 - _spectrumSlider.Value, 1, 1) { S = p.X, V = 1 - p.Y };
-            var currentColor = ColorUtilities.ConvertHsvToRgb(hsv.H, hsv.S, hsv.V);
-            currentColor.A = A;
-            SelectedColor = currentColor;
-            HexadecimalString = SelectedColor.ToString();
-        }
+      _currentColorPosition = p;
 
-        #endregion //Methods
+      _colorShadeSelectorTransform.X = ( p.X * _colorShadingCanvas.Width ) - 5;
+      _colorShadeSelectorTransform.Y = ( p.Y * _colorShadingCanvas.Height ) - 5;
     }
+
+    private void CalculateColor( Point p )
+    {
+      HsvColor hsv = new HsvColor( 360 - _spectrumSlider.Value, 1, 1 )
+      {
+        S = p.X,
+        V = 1 - p.Y
+      };
+      var currentColor = ColorUtilities.ConvertHsvToRgb( hsv.H, hsv.S, hsv.V );
+      currentColor.A = A;
+      SelectedColor = currentColor;
+      HexadecimalString = SelectedColor.ToString();
+    }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs
index 9224a8fb..18afc869 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Implementation/ColorSpectrumSlider.cs
@@ -1,4 +1,22 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Collections.Generic;
 using System.Windows;
 using System.Windows.Controls;
@@ -8,79 +26,85 @@ using Microsoft.Windows.Controls.Core.Utilities;
 
 namespace Microsoft.Windows.Controls
 {
-    public class ColorSpectrumSlider : Slider
-    {
-        #region Private Members
+  public class ColorSpectrumSlider : Slider
+  {
+    #region Private Members
 
-        private Rectangle _spectrumDisplay;
-        private LinearGradientBrush _pickerBrush;
+    private Rectangle _spectrumDisplay;
+    private LinearGradientBrush _pickerBrush;
 
-        #endregion //Private Members
+    #endregion //Private Members
 
-        #region Constructors
+    #region Constructors
 
-        static ColorSpectrumSlider()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(ColorSpectrumSlider), new FrameworkPropertyMetadata(typeof(ColorSpectrumSlider)));
-        }
-
-        #endregion //Constructors
+    static ColorSpectrumSlider()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorSpectrumSlider ), new FrameworkPropertyMetadata( typeof( ColorSpectrumSlider ) ) );
+    }
 
-        #region Dependency Properties
+    #endregion //Constructors
 
-        public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register("SelectedColor", typeof(Color), typeof(ColorSpectrumSlider), new PropertyMetadata(System.Windows.Media.Colors.Transparent));
-        public Color SelectedColor
-        {
-            get { return (Color)GetValue(SelectedColorProperty); }
-            set { SetValue(SelectedColorProperty, value); }
-        }
+    #region Dependency Properties
 
-        #endregion //Dependency Properties
+    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color ), typeof( ColorSpectrumSlider ), new PropertyMetadata( System.Windows.Media.Colors.Transparent ) );
+    public Color SelectedColor
+    {
+      get
+      {
+        return ( Color )GetValue( SelectedColorProperty );
+      }
+      set
+      {
+        SetValue( SelectedColorProperty, value );
+      }
+    }
 
-        #region Base Class Overrides
+    #endregion //Dependency Properties
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+    #region Base Class Overrides
 
-            _spectrumDisplay = (Rectangle)GetTemplateChild("PART_SpectrumDisplay");
-            CreateSpectrum();
-            OnValueChanged(Double.NaN, Value);
-        }
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-        protected override void OnValueChanged(double oldValue, double newValue)
-        {
-            base.OnValueChanged(oldValue, newValue);
+      _spectrumDisplay = ( Rectangle )GetTemplateChild( "PART_SpectrumDisplay" );
+      CreateSpectrum();
+      OnValueChanged( Double.NaN, Value );
+    }
 
-            Color color = ColorUtilities.ConvertHsvToRgb(360 - newValue, 1, 1);
-            SelectedColor = color;
-        }
+    protected override void OnValueChanged( double oldValue, double newValue )
+    {
+      base.OnValueChanged( oldValue, newValue );
 
-        #endregion //Base Class Overrides
+      Color color = ColorUtilities.ConvertHsvToRgb( 360 - newValue, 1, 1 );
+      SelectedColor = color;
+    }
 
-        #region Methods
+    #endregion //Base Class Overrides
 
-        private void CreateSpectrum()
-        {
-            _pickerBrush = new LinearGradientBrush();
-            _pickerBrush.StartPoint = new Point(0.5, 0);
-            _pickerBrush.EndPoint = new Point(0.5, 1);
-            _pickerBrush.ColorInterpolationMode = ColorInterpolationMode.SRgbLinearInterpolation;
+    #region Methods
 
-            List<Color> colorsList = ColorUtilities.GenerateHsvSpectrum();
+    private void CreateSpectrum()
+    {
+      _pickerBrush = new LinearGradientBrush();
+      _pickerBrush.StartPoint = new Point( 0.5, 0 );
+      _pickerBrush.EndPoint = new Point( 0.5, 1 );
+      _pickerBrush.ColorInterpolationMode = ColorInterpolationMode.SRgbLinearInterpolation;
 
-            double stopIncrement = (double)1 / colorsList.Count;
+      List<Color> colorsList = ColorUtilities.GenerateHsvSpectrum();
 
-            int i;
-            for (i = 0; i < colorsList.Count; i++)
-            {
-                _pickerBrush.GradientStops.Add(new GradientStop(colorsList[i], i * stopIncrement));
-            }
+      double stopIncrement = ( double )1 / colorsList.Count;
 
-            _pickerBrush.GradientStops[i - 1].Offset = 1.0;
-            _spectrumDisplay.Fill = _pickerBrush;
-        }
+      int i;
+      for( i = 0; i < colorsList.Count; i++ )
+      {
+        _pickerBrush.GradientStops.Add( new GradientStop( colorsList[ i ], i * stopIncrement ) );
+      }
 
-        #endregion //Methods
+      _pickerBrush.GradientStops[ i - 1 ].Offset = 1.0;
+      _spectrumDisplay.Fill = _pickerBrush;
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml
index 6cc8d243..62125c4e 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml
@@ -1,346 +1,403 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <coreConverters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-
-    <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="ColorCanvasBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
-        <DrawingBrush.Drawing>
-            <DrawingGroup>
-                <GeometryDrawing Brush="White">
-                    <GeometryDrawing.Geometry>
-                        <RectangleGeometry Rect="0,0 100,100" />
-                    </GeometryDrawing.Geometry>
-                </GeometryDrawing>
-                <GeometryDrawing Brush="LightGray">
-                    <GeometryDrawing.Geometry>
-                        <GeometryGroup>
-                            <RectangleGeometry Rect="0,0 50,50" />
-                            <RectangleGeometry Rect="50,50 50,50" />
-                        </GeometryGroup>
-                    </GeometryDrawing.Geometry>
-                </GeometryDrawing>
-            </DrawingGroup>
-        </DrawingBrush.Drawing>
-    </DrawingBrush>
-
-    <SolidColorBrush x:Key="HorizontalSliderTrackNormalBackground" Color="#FFE7EAEA"/>
-
-    <LinearGradientBrush x:Key="HorizontalSliderTrackNormalBorder" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FFAEB1AF" Offset="0.1"/>
-        <GradientStop Color="White" Offset=".9"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="ThumbStroke" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="ThumbFill" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFfefefe"/>
-                <GradientStop Offset="0.5" Color="#FFeff1f2"/>
-                <GradientStop Offset="1" Color="#FFd0d6db"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <SolidColorBrush x:Key="ThumbMouseOver" Color="#FFE5F2F6"/>
-
-    <Style x:Key="ColorCanvasTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
-        <Setter Property="Background" Value="Transparent" />
-        <Style.Triggers>
-            <Trigger Property="IsFocused" Value="False">
-                <Setter Property="BorderBrush" Value="Transparent" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="SliderRepeatButtonStyle"
+   <coreConverters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+   <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="ColorCanvasBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
+      <DrawingBrush.Drawing>
+         <DrawingGroup>
+            <GeometryDrawing Brush="White">
+               <GeometryDrawing.Geometry>
+                  <RectangleGeometry Rect="0,0 100,100" />
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+            <GeometryDrawing Brush="LightGray">
+               <GeometryDrawing.Geometry>
+                  <GeometryGroup>
+                     <RectangleGeometry Rect="0,0 50,50" />
+                     <RectangleGeometry Rect="50,50 50,50" />
+                  </GeometryGroup>
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+         </DrawingGroup>
+      </DrawingBrush.Drawing>
+   </DrawingBrush>
+
+   <SolidColorBrush x:Key="HorizontalSliderTrackNormalBackground" Color="#FFE7EAEA" />
+
+   <LinearGradientBrush x:Key="HorizontalSliderTrackNormalBorder" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFAEB1AF" Offset="0.1" />
+      <GradientStop Color="White" Offset=".9" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="ThumbStroke" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="ThumbFill" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFfefefe" />
+            <GradientStop Offset="0.5" Color="#FFeff1f2" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="ThumbMouseOver" Color="#FFE5F2F6" />
+
+   <Style x:Key="ColorCanvasTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="Background" Value="Transparent" />
+      <Style.Triggers>
+         <Trigger Property="IsFocused" Value="False">
+            <Setter Property="BorderBrush" Value="Transparent" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="SliderRepeatButtonStyle"
          TargetType="{x:Type RepeatButton}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="IsTabStop" Value="false"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Border Background="{TemplateBinding Background}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="CustomThumbForSlider" TargetType="{x:Type Thumb}">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Rectangle x:Name="_thumb" Fill="{StaticResource ThumbFill}" Stroke="{StaticResource ThumbStroke}" Height="14" Width="8" RadiusX="1" RadiusY="1"/>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="_thumb" Property="Rectangle.Fill" Value="{StaticResource ThumbMouseOver}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="VerticalSlideThumbStyle" TargetType="{x:Type Thumb}">
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="Height" Value="12"/>
-        <Setter Property="Width" Value="11"/>
-        <Setter Property="Foreground" Value="Gray"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Canvas SnapsToDevicePixels="true">
-                        <Path x:Name="LeftArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8" >
-                            <Path.RenderTransform>
-                                <TransformGroup>
-                                    <ScaleTransform/>
-                                    <SkewTransform/>
-                                    <RotateTransform />
-                                    <TranslateTransform Y="6" X="-3"/>
-                                </TransformGroup>
-                            </Path.RenderTransform>
-                        </Path>
-                        <Path x:Name="RightArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8" >
-                            <Path.RenderTransform>
-                                <TransformGroup>
-                                    <ScaleTransform/>
-                                    <SkewTransform/>
-                                    <RotateTransform Angle="-180"/>
-                                    <TranslateTransform Y="6" X="8"/>
-                                </TransformGroup>
-                            </Path.RenderTransform>
-                        </Path>
-                    </Canvas>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ColorCanvasSliderStyle" TargetType="{x:Type Slider}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Slider}">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+      <Setter Property="OverridesDefaultStyle" Value="true" />
+      <Setter Property="IsTabStop" Value="false" />
+      <Setter Property="Focusable" Value="false" />
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Border Background="{TemplateBinding Background}" />
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="CustomThumbForSlider" TargetType="{x:Type Thumb}">
+      <Setter Property="OverridesDefaultStyle" Value="True" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Thumb}">
+               <Rectangle x:Name="_thumb" Fill="{StaticResource ThumbFill}" Stroke="{StaticResource ThumbStroke}" Height="14" Width="8" RadiusX="1" RadiusY="1" />
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="_thumb" Property="Rectangle.Fill" Value="{StaticResource ThumbMouseOver}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="VerticalSlideThumbStyle" TargetType="{x:Type Thumb}">
+      <Setter Property="Focusable" Value="false" />
+      <Setter Property="OverridesDefaultStyle" Value="true" />
+      <Setter Property="Height" Value="12" />
+      <Setter Property="Width" Value="11" />
+      <Setter Property="Foreground" Value="Gray" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Thumb}">
+               <Canvas SnapsToDevicePixels="true">
+                  <Path x:Name="LeftArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
+                     <Path.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform />
+                           <SkewTransform />
+                           <RotateTransform />
+                           <TranslateTransform Y="6" X="-3" />
+                        </TransformGroup>
+                     </Path.RenderTransform>
+                  </Path>
+                  <Path x:Name="RightArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
+                     <Path.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform />
+                           <SkewTransform />
+                           <RotateTransform Angle="-180" />
+                           <TranslateTransform Y="6" X="8" />
+                        </TransformGroup>
+                     </Path.RenderTransform>
+                  </Path>
+               </Canvas>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ColorCanvasSliderStyle" TargetType="{x:Type Slider}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Slider}">
+               <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+                     <TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
+                     <TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
+                     <Border x:Name="TrackBackground" BorderBrush="{StaticResource HorizontalSliderTrackNormalBorder}" BorderThickness="1" Background="{StaticResource HorizontalSliderTrackNormalBackground}" CornerRadius="1" Height="4.0" Margin="5,0" Grid.Row="1" VerticalAlignment="center">
+                        <Canvas Margin="-6,-1">
+                           <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" Height="4.0" Stroke="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" StrokeThickness="1.0" Visibility="Hidden" />
+                        </Canvas>
+                     </Border>
+                     <Track x:Name="PART_Track" Grid.Row="1">
+                        <Track.DecreaseRepeatButton>
+                           <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}" />
+                        </Track.DecreaseRepeatButton>
+                        <Track.IncreaseRepeatButton>
+                           <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}" />
+                        </Track.IncreaseRepeatButton>
+                        <Track.Thumb>
+                           <Thumb x:Name="Thumb" Style="{StaticResource CustomThumbForSlider}" />
+                        </Track.Thumb>
+                     </Track>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:ColorCanvas}">
+      <Setter Property="Background" Value="{StaticResource ColorCanvasBackgroundBrush}" />
+      <Setter Property="BorderBrush" Value="{StaticResource ColorPickerDarkBorderBrush}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ColorCanvas}">
+               <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Padding="3">
+                  <Grid Margin="2">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+                     <Grid>
+                        <Grid.ColumnDefinitions >
+                           <ColumnDefinition Width="200" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <Border BorderThickness="1" BorderBrush="DarkGray" ClipToBounds="True" Background="{StaticResource CheckerBrush}">
+                           <Canvas x:Name="PART_ColorShadingCanvas" Width="200" Height="100" HorizontalAlignment="Left" VerticalAlignment="Top">
+                              <Rectangle x:Name="ColorShadingRectangle"
+                                         Height="{Binding ElementName=PART_ColorShadingCanvas, Path=Height}"
+                                         Width="{Binding ElementName=PART_ColorShadingCanvas, Path=Width}"
+                                         Fill="{Binding SelectedColor, ElementName=PART_SpectrumSlider, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              <Rectangle x:Name="WhiteGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
+                                 <Rectangle.Fill>
+                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+                                       <GradientStop Offset="0" Color="#ffffffff" />
+                                       <GradientStop Offset="1" Color="Transparent" />
+                                    </LinearGradientBrush>
+                                 </Rectangle.Fill>
+                              </Rectangle>
+                              <Rectangle x:Name="BlackGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
+                                 <Rectangle.Fill>
+                                    <LinearGradientBrush StartPoint="0,1" EndPoint="0, 0">
+                                       <GradientStop Offset="0" Color="#ff000000" />
+                                       <GradientStop Offset="1" Color="#00000000" />
+                                    </LinearGradientBrush>
+                                 </Rectangle.Fill>
+                              </Rectangle>
+                              <Canvas x:Name="PART_ColorShadeSelector" Width="10" Height="10" IsHitTestVisible="False">
+                                 <Ellipse Width="10" Height="10" StrokeThickness="3" Stroke="#FFFFFFFF" IsHitTestVisible="False" />
+                                 <Ellipse Width="10" Height="10" StrokeThickness="1" Stroke="#FF000000" IsHitTestVisible="False" />
+                              </Canvas>
+                           </Canvas>
+                        </Border>
+
+                        <Border Grid.Row="1" Margin="0,5,0,0">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="*" />
+                              </Grid.ColumnDefinitions>
+                              <Border Background="{StaticResource CheckerBrush}" Height="22" Margin="2,0,2,0" BorderThickness="1" BorderBrush="#FFC9CACA">
+                                 <Rectangle x:Name="SelectedColor" Fill="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              </Border>
+                              <TextBox Grid.Column="1" Text="{Binding HexadecimalString, RelativeSource={RelativeSource TemplatedParent}}" Margin="2,0,2,0" VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}" />
+                           </Grid>
+                        </Border>
+
+                        <Border Grid.Column="1" Grid.RowSpan="2" Margin="4,-8,0,0" ClipToBounds="False">
+                           <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider" VerticalAlignment="Stretch" />
+                        </Border>
+                     </Grid>
+
+                     <Border MinWidth="180" Grid.Row="1" BorderThickness="1" ClipToBounds="True" Margin="0,10,0,0">
                         <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Placement="Top" Grid.Row="0" Visibility="Collapsed"/>
-                            <TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Placement="Bottom" Grid.Row="2" Visibility="Collapsed"/>
-                            <Border x:Name="TrackBackground" BorderBrush="{StaticResource HorizontalSliderTrackNormalBorder}" BorderThickness="1" Background="{StaticResource HorizontalSliderTrackNormalBackground}" CornerRadius="1" Height="4.0" Margin="5,0" Grid.Row="1" VerticalAlignment="center">
-                                <Canvas Margin="-6,-1">
-                                    <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" Height="4.0" Stroke="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" StrokeThickness="1.0" Visibility="Hidden"/>
-                                </Canvas>
-                            </Border>
-                            <Track x:Name="PART_Track" Grid.Row="1">
-                                <Track.DecreaseRepeatButton>
-                                    <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}"/>
-                                </Track.DecreaseRepeatButton>
-                                <Track.IncreaseRepeatButton>
-                                    <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}"/>
-                                </Track.IncreaseRepeatButton>
-                                <Track.Thumb>
-                                    <Thumb x:Name="Thumb" Style="{StaticResource CustomThumbForSlider}"/>
-                                </Track.Thumb>
-                            </Track>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type local:ColorCanvas}">
-        <Setter Property="Background" Value="{StaticResource ColorCanvasBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{StaticResource ColorPickerDarkBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:ColorCanvas}">
-                    <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Padding="3">
-                        <Grid Margin="2">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <Grid>
-                                <Grid.ColumnDefinitions >
-                                    <ColumnDefinition Width="200"></ColumnDefinition>
-                                    <ColumnDefinition Width="Auto"></ColumnDefinition>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto"/>
-                                </Grid.RowDefinitions>
-
-                                <Border BorderThickness="1" BorderBrush="DarkGray" ClipToBounds="True" Background="{StaticResource CheckerBrush}">
-                                    <Canvas x:Name="PART_ColorShadingCanvas" Width="200" Height="100" HorizontalAlignment="Left" VerticalAlignment="Top">
-                                        <Rectangle x:Name="ColorShadingRectangle" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}"
-                                                   Fill="{Binding SelectedColor, ElementName=PART_SpectrumSlider, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                                        <Rectangle x:Name="WhiteGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}" >
-                                            <Rectangle.Fill>
-                                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
-                                                    <GradientStop Offset="0" Color="#ffffffff"/>
-                                                    <GradientStop Offset="1" Color="Transparent"/>
-                                                </LinearGradientBrush>
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <Rectangle x:Name="BlackGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}" >
-                                            <Rectangle.Fill>
-                                                <LinearGradientBrush StartPoint="0,1" EndPoint="0, 0">
-                                                    <GradientStop Offset="0" Color="#ff000000"/>
-                                                    <GradientStop Offset="1" Color="#00000000"/>
-                                                </LinearGradientBrush>
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <Canvas x:Name="PART_ColorShadeSelector" Width="10" Height="10" IsHitTestVisible="False">
-                                            <Ellipse Width="10" Height="10" StrokeThickness="3" Stroke="#FFFFFFFF" IsHitTestVisible="False"  />
-                                            <Ellipse Width="10" Height="10" StrokeThickness="1" Stroke="#FF000000" IsHitTestVisible="False" />
-                                        </Canvas>
-                                    </Canvas>
-                                </Border>
-
-                                <Border Grid.Row="1" Margin="0,5,0,0">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="*" />
-                                        </Grid.ColumnDefinitions>
-                                        <Border Background="{StaticResource CheckerBrush}" Height="22" Margin="2,0,2,0" BorderThickness="1" BorderBrush="#FFC9CACA">
-                                            <Rectangle x:Name="SelectedColor" Fill="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                                        </Border>
-                                        <TextBox Grid.Column="1" Text="{Binding HexadecimalString, RelativeSource={RelativeSource TemplatedParent}}" Margin="2,0,2,0" VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}" />
-                                    </Grid>
-                                </Border>
-
-                                <Border Grid.Column="1" Grid.RowSpan="2" Margin="4,-8,0,0" ClipToBounds="False">
-                                    <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider" VerticalAlignment="Stretch" />
-                                </Border>
-                            </Grid>
-
-                            <Border MinWidth="180" Grid.Row="1" BorderThickness="1" ClipToBounds="True" Margin="0,10,0,0">
-                                <Grid>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                    </Grid.RowDefinitions>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-
-                                    <TextBlock Grid.Row="0" Grid.Column="0" Text="R"
-                                               VerticalAlignment="Center"/>
-                                    <Slider x:Name="PART_RSlider" Maximum="255" TickFrequency="1" Grid.Row="0" Grid.Column="1" Margin="4,6,4,6"
-                                            Style="{StaticResource ColorCanvasSliderStyle}"
-                                            Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
-                                            VerticalAlignment="Center"/>
-                                    <TextBox Grid.Row="0" Grid.Column="2" Text="{Binding Value, ElementName=PART_RSlider}"
-                                             VerticalAlignment="Center"
-                                             Style="{StaticResource ColorCanvasTextBoxStyle}"/>
-
-                                    <TextBlock Grid.Row="1" Grid.Column="0" Text="G"
-                                               VerticalAlignment="Center"/>
-                                    <Slider x:Name="PART_GSlider" Maximum="255" TickFrequency="1" Grid.Row="1" Grid.Column="1" Margin="4,6,4,6"
-                                            Style="{StaticResource ColorCanvasSliderStyle}"
-                                            Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
-                                            VerticalAlignment="Center"/>
-                                    <TextBox Grid.Row="1" Grid.Column="2" Text="{Binding Value, ElementName=PART_GSlider}"
-                                             VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}"/>
-
-                                    <TextBlock Grid.Row="2" Grid.Column="0" Text="B"
-                                               VerticalAlignment="Center"/>
-                                    <Slider x:Name="PART_BSlider" Maximum="255" TickFrequency="1" Grid.Row="2" Grid.Column="1" Margin="4,6,4,6"
-                                            Style="{StaticResource ColorCanvasSliderStyle}"
-                                            Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
-                                            VerticalAlignment="Center"/>
-                                    <TextBox Grid.Row="2" Grid.Column="3" Text="{Binding Value, ElementName=PART_BSlider}"
-                                             VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}"/>
-
-                                    <TextBlock Grid.Row="3" Grid.Column="0" Text="A"
-                                               VerticalAlignment="Center"/>
-                                    <Slider x:Name="PART_OpacitySlider" Grid.Row="3" Grid.Column="1" Maximum="255" Margin="4,6,4,6"
-                                            Style="{StaticResource ColorCanvasSliderStyle}"
-                                            Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
-                                            VerticalAlignment="Center"/>
-                                    <TextBox Grid.Row="3" Grid.Column="3" Text="{Binding Value, ElementName=PART_OpacitySlider}"
-                                             VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}"/>
-
-                                </Grid>
-                            </Border>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition Height="Auto" />
+                           </Grid.RowDefinitions>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto" />
+                              <ColumnDefinition Width="*" />
+                              <ColumnDefinition Width="Auto" />
+                           </Grid.ColumnDefinitions>
+
+                           <TextBlock Grid.Row="0"
+                                      Grid.Column="0"
+                                      Text="R"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_RSlider"
+                                   Maximum="255"
+                                   TickFrequency="1"
+                                   Grid.Row="0"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="0"
+                                    Grid.Column="2"
+                                    Text="{Binding Value, ElementName=PART_RSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                           <TextBlock Grid.Row="1"
+                                      Grid.Column="0"
+                                      Text="G"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_GSlider"
+                                   Maximum="255"
+                                   TickFrequency="1"
+                                   Grid.Row="1"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="1"
+                                    Grid.Column="2"
+                                    Text="{Binding Value, ElementName=PART_GSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                           <TextBlock Grid.Row="2"
+                                      Grid.Column="0"
+                                      Text="B"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_BSlider"
+                                   Maximum="255"
+                                   TickFrequency="1"
+                                   Grid.Row="2"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="2"
+                                    Grid.Column="3"
+                                    Text="{Binding Value, ElementName=PART_BSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                           <TextBlock Grid.Row="3"
+                                      Grid.Column="0"
+                                      Text="A"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_OpacitySlider"
+                                   Grid.Row="3"
+                                   Grid.Column="1"
+                                   Maximum="255"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="3"
+                                    Grid.Column="3"
+                                    Text="{Binding Value, ElementName=PART_OpacitySlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
                         </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type local:ColorSpectrumSlider}">
-        <Setter Property="Orientation" Value="Vertical"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-        <Setter Property="Minimum" Value="1"/>
-        <Setter Property="Maximum" Value="360"/>
-        <Setter Property="TickFrequency" Value="0.001" />
-        <Setter Property="IsSnapToTickEnabled" Value="True" />
-        <Setter Property="IsDirectionReversed" Value="False" />
-        <Setter Property="IsMoveToPointEnabled" Value="True" />
-        <Setter Property="Value" Value="0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:ColorSpectrumSlider}">
-                    <Grid>
-                        <Border x:Name="PART_TrackBackground" BorderBrush="DarkGray" BorderThickness="1" Width="15" Margin="0,8,0,0" >
-                            <Rectangle x:Name="PART_SpectrumDisplay" Stretch="Fill" VerticalAlignment="Stretch" />
-                        </Border>
+                     </Border>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:ColorSpectrumSlider}">
+      <Setter Property="Orientation" Value="Vertical" />
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+      <Setter Property="Minimum" Value="1" />
+      <Setter Property="Maximum" Value="360" />
+      <Setter Property="TickFrequency" Value="0.001" />
+      <Setter Property="IsSnapToTickEnabled" Value="True" />
+      <Setter Property="IsDirectionReversed" Value="False" />
+      <Setter Property="IsMoveToPointEnabled" Value="True" />
+      <Setter Property="Value" Value="0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ColorSpectrumSlider}">
+               <Grid>
+                  <Border x:Name="PART_TrackBackground" BorderBrush="DarkGray" BorderThickness="1" Width="15" Margin="0,8,0,0">
+                     <Rectangle x:Name="PART_SpectrumDisplay" Stretch="Fill" VerticalAlignment="Stretch" />
+                  </Border>
 
-                        <Track Name="PART_Track">
-                            <Track.DecreaseRepeatButton>
-                                <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.DecreaseLarge"/>
-                            </Track.DecreaseRepeatButton>
-                            <Track.IncreaseRepeatButton>
-                                <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.IncreaseLarge"/>
-                            </Track.IncreaseRepeatButton>
-                            <Track.Thumb>
-                                <Thumb Style="{StaticResource VerticalSlideThumbStyle}" />
-                            </Track.Thumb>
-                        </Track>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                  <Track Name="PART_Track">
+                     <Track.DecreaseRepeatButton>
+                        <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.DecreaseLarge" />
+                     </Track.DecreaseRepeatButton>
+                     <Track.IncreaseRepeatButton>
+                        <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.IncreaseLarge" />
+                     </Track.IncreaseRepeatButton>
+                     <Track.Thumb>
+                        <Thumb Style="{StaticResource VerticalSlideThumbStyle}" />
+                     </Track.Thumb>
+                  </Track>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs
index 0f846a9a..c726970e 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorItem.cs
@@ -1,17 +1,42 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Media;
 
 namespace Microsoft.Windows.Controls
 {
-    public class ColorItem
+  public class ColorItem
+  {
+    public Color Color
+    {
+      get;
+      set;
+    }
+    public string Name
+    {
+      get;
+      set;
+    }
+
+    public ColorItem( Color color, string name )
     {
-        public Color Color { get; set; }
-        public string Name { get; set; }
-
-        public ColorItem(Color color, string name)
-        {
-            Color = color;
-            Name = name;
-        }
+      Color = color;
+      Name = name;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs
index 720e07e5..374aa5f1 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Implementation/ColorPicker.cs
@@ -1,352 +1,466 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
+using System.Collections.ObjectModel;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Media;
-using System.Collections.ObjectModel;
 using System.Windows.Input;
+using System.Windows.Media;
 using Microsoft.Windows.Controls.Core.Utilities;
 
 namespace Microsoft.Windows.Controls
 {
-    public class ColorPicker : Control
-    {
-        #region Members
+  public class ColorPicker : Control
+  {
+    #region Members
 
-        private ListBox _availableColors;
-        private ListBox _standardColors;
-        private ListBox _recentColors;
+    private ListBox _availableColors;
+    private ListBox _standardColors;
+    private ListBox _recentColors;
 
-        #endregion //Members
+    #endregion //Members
 
-        #region Properties
+    #region Properties
 
-        #region AvailableColors
+    #region AvailableColors
 
-        public static readonly DependencyProperty AvailableColorsProperty = DependencyProperty.Register("AvailableColors", typeof(ObservableCollection<ColorItem>), typeof(ColorPicker), new UIPropertyMetadata(CreateAvailableColors()));
-        public ObservableCollection<ColorItem> AvailableColors
-        {
-            get { return (ObservableCollection<ColorItem>)GetValue(AvailableColorsProperty); }
-            set { SetValue(AvailableColorsProperty, value); }
-        }
+    public static readonly DependencyProperty AvailableColorsProperty = DependencyProperty.Register( "AvailableColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( CreateAvailableColors() ) );
+    public ObservableCollection<ColorItem> AvailableColors
+    {
+      get
+      {
+        return ( ObservableCollection<ColorItem> )GetValue( AvailableColorsProperty );
+      }
+      set
+      {
+        SetValue( AvailableColorsProperty, value );
+      }
+    }
 
-        #endregion //AvailableColors
+    #endregion //AvailableColors
 
-        #region AvailableColorsHeader
+    #region AvailableColorsHeader
 
-        public static readonly DependencyProperty AvailableColorsHeaderProperty = DependencyProperty.Register("AvailableColorsHeader", typeof(string), typeof(ColorPicker), new UIPropertyMetadata("Available Colors"));
-        public string AvailableColorsHeader
-        {
-            get { return (string)GetValue(AvailableColorsHeaderProperty); }
-            set { SetValue(AvailableColorsHeaderProperty, value); }
-        }
+    public static readonly DependencyProperty AvailableColorsHeaderProperty = DependencyProperty.Register( "AvailableColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Available Colors" ) );
+    public string AvailableColorsHeader
+    {
+      get
+      {
+        return ( string )GetValue( AvailableColorsHeaderProperty );
+      }
+      set
+      {
+        SetValue( AvailableColorsHeaderProperty, value );
+      }
+    }
 
-        #endregion //AvailableColorsHeader
+    #endregion //AvailableColorsHeader
 
-        #region ButtonStyle
+    #region ButtonStyle
 
-        public static readonly DependencyProperty ButtonStyleProperty = DependencyProperty.Register("ButtonStyle", typeof(Style), typeof(ColorPicker));
-        public Style ButtonStyle
-        {
-            get { return (Style)GetValue(ButtonStyleProperty); }
-            set { SetValue(ButtonStyleProperty, value); }
-        }
+    public static readonly DependencyProperty ButtonStyleProperty = DependencyProperty.Register( "ButtonStyle", typeof( Style ), typeof( ColorPicker ) );
+    public Style ButtonStyle
+    {
+      get
+      {
+        return ( Style )GetValue( ButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( ButtonStyleProperty, value );
+      }
+    }
 
-        #endregion //ButtonStyle
+    #endregion //ButtonStyle
 
-        #region DisplayColorAndName
+    #region DisplayColorAndName
 
-        public static readonly DependencyProperty DisplayColorAndNameProperty = DependencyProperty.Register("DisplayColorAndName", typeof(bool), typeof(ColorPicker), new UIPropertyMetadata(false));
-        public bool DisplayColorAndName
-        {
-            get { return (bool)GetValue(DisplayColorAndNameProperty); }
-            set { SetValue(DisplayColorAndNameProperty, value); }
-        }
+    public static readonly DependencyProperty DisplayColorAndNameProperty = DependencyProperty.Register( "DisplayColorAndName", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false ) );
+    public bool DisplayColorAndName
+    {
+      get
+      {
+        return ( bool )GetValue( DisplayColorAndNameProperty );
+      }
+      set
+      {
+        SetValue( DisplayColorAndNameProperty, value );
+      }
+    }
 
-        #endregion //DisplayColorAndName
+    #endregion //DisplayColorAndName
 
-        #region IsOpen
+    #region IsOpen
 
-        public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register("IsOpen", typeof(bool), typeof(ColorPicker), new UIPropertyMetadata(false));
-        public bool IsOpen
-        {
-            get { return (bool)GetValue(IsOpenProperty); }
-            set { SetValue(IsOpenProperty, value); }
-        }
-
-        #endregion //IsOpen
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
 
-        #region RecentColors
+    #endregion //IsOpen
 
-        public static readonly DependencyProperty RecentColorsProperty = DependencyProperty.Register("RecentColors", typeof(ObservableCollection<ColorItem>), typeof(ColorPicker), new UIPropertyMetadata(null));
-        public ObservableCollection<ColorItem> RecentColors
-        {
-            get { return (ObservableCollection<ColorItem>)GetValue(RecentColorsProperty); }
-            set { SetValue(RecentColorsProperty, value); }
-        }
+    #region RecentColors
 
-        #endregion //RecentColors
+    public static readonly DependencyProperty RecentColorsProperty = DependencyProperty.Register( "RecentColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( null ) );
+    public ObservableCollection<ColorItem> RecentColors
+    {
+      get
+      {
+        return ( ObservableCollection<ColorItem> )GetValue( RecentColorsProperty );
+      }
+      set
+      {
+        SetValue( RecentColorsProperty, value );
+      }
+    }
 
-        #region RecentColorsHeader
+    #endregion //RecentColors
 
-        public static readonly DependencyProperty RecentColorsHeaderProperty = DependencyProperty.Register("RecentColorsHeader", typeof(string), typeof(ColorPicker), new UIPropertyMetadata("Recent Colors"));
-        public string RecentColorsHeader
-        {
-            get { return (string)GetValue(RecentColorsHeaderProperty); }
-            set { SetValue(RecentColorsHeaderProperty, value); }
-        }
+    #region RecentColorsHeader
 
-        #endregion //RecentColorsHeader
+    public static readonly DependencyProperty RecentColorsHeaderProperty = DependencyProperty.Register( "RecentColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Recent Colors" ) );
+    public string RecentColorsHeader
+    {
+      get
+      {
+        return ( string )GetValue( RecentColorsHeaderProperty );
+      }
+      set
+      {
+        SetValue( RecentColorsHeaderProperty, value );
+      }
+    }
 
-        #region SelectedColor
+    #endregion //RecentColorsHeader
 
-        public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register("SelectedColor", typeof(Color), typeof(ColorPicker), new FrameworkPropertyMetadata(Colors.Black, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback(OnSelectedColorPropertyChanged)));
-        public Color SelectedColor
-        {
-            get { return (Color)GetValue(SelectedColorProperty); }
-            set { SetValue(SelectedColorProperty, value); }
-        }
+    #region SelectedColor
 
-        private static void OnSelectedColorPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            ColorPicker colorPicker = (ColorPicker)d;
-            if (colorPicker != null)
-                colorPicker.OnSelectedColorChanged((Color)e.OldValue, (Color)e.NewValue);
-        }
+    public static readonly DependencyProperty SelectedColorProperty = DependencyProperty.Register( "SelectedColor", typeof( Color ), typeof( ColorPicker ), new FrameworkPropertyMetadata( Colors.Black, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, new PropertyChangedCallback( OnSelectedColorPropertyChanged ) ) );
+    public Color SelectedColor
+    {
+      get
+      {
+        return ( Color )GetValue( SelectedColorProperty );
+      }
+      set
+      {
+        SetValue( SelectedColorProperty, value );
+      }
+    }
 
-        private void OnSelectedColorChanged(Color oldValue, Color newValue)
-        {
-            SelectedColorText = newValue.GetColorName();
+    private static void OnSelectedColorPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      ColorPicker colorPicker = ( ColorPicker )d;
+      if( colorPicker != null )
+        colorPicker.OnSelectedColorChanged( ( Color )e.OldValue, ( Color )e.NewValue );
+    }
 
-            RoutedPropertyChangedEventArgs<Color> args = new RoutedPropertyChangedEventArgs<Color>(oldValue, newValue);
-            args.RoutedEvent = ColorPicker.SelectedColorChangedEvent;
-            RaiseEvent(args);
-        }
+    private void OnSelectedColorChanged( Color oldValue, Color newValue )
+    {
+      SelectedColorText = newValue.GetColorName();
 
-        #endregion //SelectedColor
+      RoutedPropertyChangedEventArgs<Color> args = new RoutedPropertyChangedEventArgs<Color>( oldValue, newValue );
+      args.RoutedEvent = ColorPicker.SelectedColorChangedEvent;
+      RaiseEvent( args );
+    }
 
-        #region SelectedColorText
+    #endregion //SelectedColor
 
-        public static readonly DependencyProperty SelectedColorTextProperty = DependencyProperty.Register("SelectedColorText", typeof(string), typeof(ColorPicker), new UIPropertyMetadata("Black"));
-        public string SelectedColorText
-        {
-            get { return (string)GetValue(SelectedColorTextProperty); }
-            protected set { SetValue(SelectedColorTextProperty, value); }
-        }
+    #region SelectedColorText
 
-        #endregion //SelectedColorText
+    public static readonly DependencyProperty SelectedColorTextProperty = DependencyProperty.Register( "SelectedColorText", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Black" ) );
+    public string SelectedColorText
+    {
+      get
+      {
+        return ( string )GetValue( SelectedColorTextProperty );
+      }
+      protected set
+      {
+        SetValue( SelectedColorTextProperty, value );
+      }
+    }
 
-        #region ShowAdvancedButton
+    #endregion //SelectedColorText
 
-        public static readonly DependencyProperty ShowAdvancedButtonProperty = DependencyProperty.Register("ShowAdvancedButton", typeof(bool), typeof(ColorPicker), new UIPropertyMetadata(true));
-        public bool ShowAdvancedButton
-        {
-            get { return (bool)GetValue(ShowAdvancedButtonProperty); }
-            set { SetValue(ShowAdvancedButtonProperty, value); }
-        }
+    #region ShowAdvancedButton
 
-        #endregion //ShowAdvancedButton
+    public static readonly DependencyProperty ShowAdvancedButtonProperty = DependencyProperty.Register( "ShowAdvancedButton", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
+    public bool ShowAdvancedButton
+    {
+      get
+      {
+        return ( bool )GetValue( ShowAdvancedButtonProperty );
+      }
+      set
+      {
+        SetValue( ShowAdvancedButtonProperty, value );
+      }
+    }
 
-        #region ShowAvailableColors
+    #endregion //ShowAdvancedButton
 
-        public static readonly DependencyProperty ShowAvailableColorsProperty = DependencyProperty.Register("ShowAvailableColors", typeof(bool), typeof(ColorPicker), new UIPropertyMetadata(true));
-        public bool ShowAvailableColors
-        {
-            get { return (bool)GetValue(ShowAvailableColorsProperty); }
-            set { SetValue(ShowAvailableColorsProperty, value); }
-        }
+    #region ShowAvailableColors
 
-        #endregion //ShowAvailableColors
+    public static readonly DependencyProperty ShowAvailableColorsProperty = DependencyProperty.Register( "ShowAvailableColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
+    public bool ShowAvailableColors
+    {
+      get
+      {
+        return ( bool )GetValue( ShowAvailableColorsProperty );
+      }
+      set
+      {
+        SetValue( ShowAvailableColorsProperty, value );
+      }
+    }
 
-        #region ShowRecentColors
+    #endregion //ShowAvailableColors
 
-        public static readonly DependencyProperty ShowRecentColorsProperty = DependencyProperty.Register("ShowRecentColors", typeof(bool), typeof(ColorPicker), new UIPropertyMetadata(false));
-        public bool ShowRecentColors
-        {
-            get { return (bool)GetValue(ShowRecentColorsProperty); }
-            set { SetValue(ShowRecentColorsProperty, value); }
-        }
+    #region ShowRecentColors
 
-        #endregion //DisplayRecentColors
+    public static readonly DependencyProperty ShowRecentColorsProperty = DependencyProperty.Register( "ShowRecentColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( false ) );
+    public bool ShowRecentColors
+    {
+      get
+      {
+        return ( bool )GetValue( ShowRecentColorsProperty );
+      }
+      set
+      {
+        SetValue( ShowRecentColorsProperty, value );
+      }
+    }
 
-        #region ShowStandardColors
+    #endregion //DisplayRecentColors
 
-        public static readonly DependencyProperty ShowStandardColorsProperty = DependencyProperty.Register("ShowStandardColors", typeof(bool), typeof(ColorPicker), new UIPropertyMetadata(true));
-        public bool ShowStandardColors
-        {
-            get { return (bool)GetValue(ShowStandardColorsProperty); }
-            set { SetValue(ShowStandardColorsProperty, value); }
-        }
+    #region ShowStandardColors
 
-        #endregion //DisplayStandardColors
+    public static readonly DependencyProperty ShowStandardColorsProperty = DependencyProperty.Register( "ShowStandardColors", typeof( bool ), typeof( ColorPicker ), new UIPropertyMetadata( true ) );
+    public bool ShowStandardColors
+    {
+      get
+      {
+        return ( bool )GetValue( ShowStandardColorsProperty );
+      }
+      set
+      {
+        SetValue( ShowStandardColorsProperty, value );
+      }
+    }
 
-        #region StandardColors
+    #endregion //DisplayStandardColors
 
-        public static readonly DependencyProperty StandardColorsProperty = DependencyProperty.Register("StandardColors", typeof(ObservableCollection<ColorItem>), typeof(ColorPicker), new UIPropertyMetadata(CreateStandardColors()));
-        public ObservableCollection<ColorItem> StandardColors
-        {
-            get { return (ObservableCollection<ColorItem>)GetValue(StandardColorsProperty); }
-            set { SetValue(StandardColorsProperty, value); }
-        }
+    #region StandardColors
 
-        #endregion //StandardColors
+    public static readonly DependencyProperty StandardColorsProperty = DependencyProperty.Register( "StandardColors", typeof( ObservableCollection<ColorItem> ), typeof( ColorPicker ), new UIPropertyMetadata( CreateStandardColors() ) );
+    public ObservableCollection<ColorItem> StandardColors
+    {
+      get
+      {
+        return ( ObservableCollection<ColorItem> )GetValue( StandardColorsProperty );
+      }
+      set
+      {
+        SetValue( StandardColorsProperty, value );
+      }
+    }
 
-        #region StandardColorsHeader
+    #endregion //StandardColors
 
-        public static readonly DependencyProperty StandardColorsHeaderProperty = DependencyProperty.Register("StandardColorsHeader", typeof(string), typeof(ColorPicker), new UIPropertyMetadata("Standard Colors"));
-        public string StandardColorsHeader
-        {
-            get { return (string)GetValue(StandardColorsHeaderProperty); }
-            set { SetValue(StandardColorsHeaderProperty, value); }
-        }
+    #region StandardColorsHeader
 
-        #endregion //StandardColorsHeader
+    public static readonly DependencyProperty StandardColorsHeaderProperty = DependencyProperty.Register( "StandardColorsHeader", typeof( string ), typeof( ColorPicker ), new UIPropertyMetadata( "Standard Colors" ) );
+    public string StandardColorsHeader
+    {
+      get
+      {
+        return ( string )GetValue( StandardColorsHeaderProperty );
+      }
+      set
+      {
+        SetValue( StandardColorsHeaderProperty, value );
+      }
+    }
 
-        #endregion //Properties
+    #endregion //StandardColorsHeader
 
-        #region Constructors
+    #endregion //Properties
 
-        static ColorPicker()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(ColorPicker), new FrameworkPropertyMetadata(typeof(ColorPicker)));
-        }
+    #region Constructors
 
-        public ColorPicker()
-        {
-            RecentColors = new ObservableCollection<ColorItem>();
-            Keyboard.AddKeyDownHandler(this, OnKeyDown);
-            Mouse.AddPreviewMouseDownOutsideCapturedElementHandler(this, OnMouseDownOutsideCapturedElement);
-        }
+    static ColorPicker()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( ColorPicker ), new FrameworkPropertyMetadata( typeof( ColorPicker ) ) );
+    }
 
-        #endregion //Constructors
+    public ColorPicker()
+    {
+      RecentColors = new ObservableCollection<ColorItem>();
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
 
-        #region Base Class Overrides
+    #endregion //Constructors
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+    #region Base Class Overrides
 
-            if (_availableColors != null)
-                _availableColors.SelectionChanged -= Color_SelectionChanged;
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-            _availableColors = GetTemplateChild("PART_AvailableColors") as ListBox;
-            if (_availableColors != null)
-                _availableColors.SelectionChanged += Color_SelectionChanged;
+      if( _availableColors != null )
+        _availableColors.SelectionChanged -= Color_SelectionChanged;
 
-            if (_standardColors != null)
-                _standardColors.SelectionChanged -= Color_SelectionChanged;
+      _availableColors = GetTemplateChild( "PART_AvailableColors" ) as ListBox;
+      if( _availableColors != null )
+        _availableColors.SelectionChanged += Color_SelectionChanged;
 
-            _standardColors = GetTemplateChild("PART_StandardColors") as ListBox;
-            if (_standardColors != null)
-                _standardColors.SelectionChanged += Color_SelectionChanged;
+      if( _standardColors != null )
+        _standardColors.SelectionChanged -= Color_SelectionChanged;
 
-            if (_recentColors != null)
-                _recentColors.SelectionChanged -= Color_SelectionChanged;
+      _standardColors = GetTemplateChild( "PART_StandardColors" ) as ListBox;
+      if( _standardColors != null )
+        _standardColors.SelectionChanged += Color_SelectionChanged;
 
-            _recentColors = GetTemplateChild("PART_RecentColors") as ListBox;
-            if (_recentColors != null)
-                _recentColors.SelectionChanged += Color_SelectionChanged;
-        }
+      if( _recentColors != null )
+        _recentColors.SelectionChanged -= Color_SelectionChanged;
 
-        #endregion //Base Class Overrides
+      _recentColors = GetTemplateChild( "PART_RecentColors" ) as ListBox;
+      if( _recentColors != null )
+        _recentColors.SelectionChanged += Color_SelectionChanged;
+    }
 
-        #region Event Handlers
+    #endregion //Base Class Overrides
 
-        private void OnKeyDown(object sender, KeyEventArgs e)
-        {
-            switch (e.Key)
-            {
-                case Key.Escape:
-                case Key.Tab:
-                    {
-                        CloseColorPicker();
-                        break;
-                    }
-            }
-        }
+    #region Event Handlers
 
-        private void OnMouseDownOutsideCapturedElement(object sender, MouseButtonEventArgs e)
-        {
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+        case Key.Tab:
+          {
             CloseColorPicker();
-        }
+            break;
+          }
+      }
+    }
 
-        private void Color_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            ListBox lb = (ListBox)sender;
-
-            if (e.AddedItems.Count > 0)
-            {
-                var colorItem = (ColorItem)e.AddedItems[0];
-                SelectedColor = colorItem.Color;
-                UpdateRecentColors(colorItem);
-                CloseColorPicker();
-                lb.SelectedIndex = -1; //for now I don't care about keeping track of the selected color
-            }
-        }
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseColorPicker();
+    }
 
-        #endregion //Event Handlers
+    private void Color_SelectionChanged( object sender, SelectionChangedEventArgs e )
+    {
+      ListBox lb = ( ListBox )sender;
+
+      if( e.AddedItems.Count > 0 )
+      {
+        var colorItem = ( ColorItem )e.AddedItems[ 0 ];
+        SelectedColor = colorItem.Color;
+        UpdateRecentColors( colorItem );
+        CloseColorPicker();
+        lb.SelectedIndex = -1; //for now I don't care about keeping track of the selected color
+      }
+    }
 
-        #region Events
+    #endregion //Event Handlers
 
-        public static readonly RoutedEvent SelectedColorChangedEvent = EventManager.RegisterRoutedEvent("SelectedColorChanged", RoutingStrategy.Bubble, typeof(RoutedPropertyChangedEventHandler<Color>), typeof(ColorPicker));
-        public event RoutedPropertyChangedEventHandler<Color> SelectedColorChanged
-        {
-            add { AddHandler(SelectedColorChangedEvent, value); }
-            remove { RemoveHandler(SelectedColorChangedEvent, value); }
-        }
+    #region Events
 
-        #endregion //Events
+    public static readonly RoutedEvent SelectedColorChangedEvent = EventManager.RegisterRoutedEvent( "SelectedColorChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<Color> ), typeof( ColorPicker ) );
+    public event RoutedPropertyChangedEventHandler<Color> SelectedColorChanged
+    {
+      add
+      {
+        AddHandler( SelectedColorChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( SelectedColorChangedEvent, value );
+      }
+    }
 
-        #region Methods
+    #endregion //Events
 
-        private void CloseColorPicker()
-        {
-            if (IsOpen)
-                IsOpen = false;
-            ReleaseMouseCapture();
-        }
+    #region Methods
 
-        private void UpdateRecentColors(ColorItem colorItem)
-        {
-            if (!RecentColors.Contains(colorItem))
-                RecentColors.Add(colorItem);
+    private void CloseColorPicker()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
 
-            if (RecentColors.Count > 10) //don't allow more than ten, maybe make a property that can be set by the user.
-                RecentColors.RemoveAt(0);
-        }
+    private void UpdateRecentColors( ColorItem colorItem )
+    {
+      if( !RecentColors.Contains( colorItem ) )
+        RecentColors.Add( colorItem );
 
-        private static ObservableCollection<ColorItem> CreateStandardColors()
-        {
-            ObservableCollection<ColorItem> _standardColors = new ObservableCollection<ColorItem>();
-            _standardColors.Add(new ColorItem(Colors.Transparent, "Transparent"));
-            _standardColors.Add(new ColorItem(Colors.White, "White"));
-            _standardColors.Add(new ColorItem(Colors.Gray, "Gray"));
-            _standardColors.Add(new ColorItem(Colors.Black, "Black"));
-            _standardColors.Add(new ColorItem(Colors.Red, "Red"));
-            _standardColors.Add(new ColorItem(Colors.Green, "Green"));
-            _standardColors.Add(new ColorItem(Colors.Blue, "Blue"));
-            _standardColors.Add(new ColorItem(Colors.Yellow, "Yellow"));
-            _standardColors.Add(new ColorItem(Colors.Orange, "Orange"));
-            _standardColors.Add(new ColorItem(Colors.Purple, "Purple"));
-            return _standardColors;
-        }
+      if( RecentColors.Count > 10 ) //don't allow more than ten, maybe make a property that can be set by the user.
+        RecentColors.RemoveAt( 0 );
+    }
+
+    private static ObservableCollection<ColorItem> CreateStandardColors()
+    {
+      ObservableCollection<ColorItem> _standardColors = new ObservableCollection<ColorItem>();
+      _standardColors.Add( new ColorItem( Colors.Transparent, "Transparent" ) );
+      _standardColors.Add( new ColorItem( Colors.White, "White" ) );
+      _standardColors.Add( new ColorItem( Colors.Gray, "Gray" ) );
+      _standardColors.Add( new ColorItem( Colors.Black, "Black" ) );
+      _standardColors.Add( new ColorItem( Colors.Red, "Red" ) );
+      _standardColors.Add( new ColorItem( Colors.Green, "Green" ) );
+      _standardColors.Add( new ColorItem( Colors.Blue, "Blue" ) );
+      _standardColors.Add( new ColorItem( Colors.Yellow, "Yellow" ) );
+      _standardColors.Add( new ColorItem( Colors.Orange, "Orange" ) );
+      _standardColors.Add( new ColorItem( Colors.Purple, "Purple" ) );
+      return _standardColors;
+    }
 
-        private static ObservableCollection<ColorItem> CreateAvailableColors()
+    private static ObservableCollection<ColorItem> CreateAvailableColors()
+    {
+      ObservableCollection<ColorItem> _standardColors = new ObservableCollection<ColorItem>();
+
+      foreach( var item in ColorUtilities.KnownColors )
+      {
+        if( !String.Equals( item.Key, "Transparent" ) )
         {
-            ObservableCollection<ColorItem> _standardColors = new ObservableCollection<ColorItem>();
-
-            foreach (var item in ColorUtilities.KnownColors)
-            {
-                if (!String.Equals(item.Key, "Transparent"))
-                {
-                    var colorItem = new ColorItem(item.Value, item.Key);
-                    if (!_standardColors.Contains(colorItem))
-                        _standardColors.Add(colorItem);
-                }
-            }
-
-            return _standardColors;
+          var colorItem = new ColorItem( item.Value, item.Key );
+          if( !_standardColors.Contains( colorItem ) )
+            _standardColors.Add( colorItem );
         }
+      }
 
-        #endregion //Methods
+      return _standardColors;
     }
+
+    #endregion //Methods
+  }
 }
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml
index 445436f5..f5abdeb5 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml
@@ -1,285 +1,315 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes">
 
-    <SolidColorBrush x:Key="ButtonHover" Color="#C2E0FF"/>
-    <SolidColorBrush x:Key="ButtonHoverBorder" Color="#3399FF"/>
-    <SolidColorBrush x:Key="ButtonChecked" Color="#E6F0FA"/>
-    <SolidColorBrush x:Key="ButtonPressed" Color="#99CCFF"/>
-    <SolidColorBrush x:Key="ButtonPressedBorder" Color="#3399FF"/>
-
-    <!-- =============================================================================== -->
-    <!-- ColorPicker                                                                     -->
-    <!-- =============================================================================== -->
-
-    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-    <coreConverters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-
-    <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
-        <DrawingBrush.Drawing>
-            <DrawingGroup>
-                <GeometryDrawing Brush="White">
-                    <GeometryDrawing.Geometry>
-                        <RectangleGeometry Rect="0,0 100,100" />
-                    </GeometryDrawing.Geometry>
-                </GeometryDrawing>
-                <GeometryDrawing Brush="LightGray">
-                    <GeometryDrawing.Geometry>
-                        <GeometryGroup>
-                            <RectangleGeometry Rect="0,0 50,50" />
-                            <RectangleGeometry Rect="50,50 50,50" />
-                        </GeometryGroup>
-                    </GeometryDrawing.Geometry>
-                </GeometryDrawing>
-            </DrawingGroup>
-        </DrawingBrush.Drawing>
-    </DrawingBrush>
-
-    <Style x:Key="ColorItemContainerStyle" TargetType="{x:Type ListBoxItem}">
-        <Setter Property="ToolTip" Value="{Binding Name}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <Grid ToolTip="{Binding Name}">
-                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        <Border BorderThickness="1" Background="Transparent" BorderBrush="Transparent" x:Name="_outerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                            <Border Background="Transparent" BorderThickness="1" BorderBrush="Transparent" x:Name="_innerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+   <SolidColorBrush x:Key="ButtonHover" Color="#C2E0FF" />
+   <SolidColorBrush x:Key="ButtonHoverBorder" Color="#3399FF" />
+   <SolidColorBrush x:Key="ButtonChecked" Color="#E6F0FA" />
+   <SolidColorBrush x:Key="ButtonPressed" Color="#99CCFF" />
+   <SolidColorBrush x:Key="ButtonPressedBorder" Color="#3399FF" />
+
+   <!-- =============================================================================== -->
+   <!-- ColorPicker                                                                     -->
+   <!-- =============================================================================== -->
+
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <coreConverters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+   <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
+      <DrawingBrush.Drawing>
+         <DrawingGroup>
+            <GeometryDrawing Brush="White">
+               <GeometryDrawing.Geometry>
+                  <RectangleGeometry Rect="0,0 100,100" />
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+            <GeometryDrawing Brush="LightGray">
+               <GeometryDrawing.Geometry>
+                  <GeometryGroup>
+                     <RectangleGeometry Rect="0,0 50,50" />
+                     <RectangleGeometry Rect="50,50 50,50" />
+                  </GeometryGroup>
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+         </DrawingGroup>
+      </DrawingBrush.Drawing>
+   </DrawingBrush>
+
+   <Style x:Key="ColorItemContainerStyle" TargetType="{x:Type ListBoxItem}">
+      <Setter Property="ToolTip" Value="{Binding Name}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ListBoxItem}">
+               <Grid ToolTip="{Binding Name}">
+                  <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                  <Border BorderThickness="1" Background="Transparent" BorderBrush="Transparent" x:Name="_outerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                     <Border Background="Transparent" BorderThickness="1" BorderBrush="Transparent" x:Name="_innerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
+                     <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
+                     <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <DataTemplate x:Key="ColorItemTemplate">
+      <Grid>
+         <Border BorderBrush="#FFC9CACA" BorderThickness="1" Margin="2,2,2,2" >
+            <Rectangle Width="14" Height="14">
+               <Rectangle.Style>
+                  <Style TargetType="Rectangle">
+                     <Setter Property="Fill" Value="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                     <Style.Triggers>
+                        <DataTrigger Binding="{Binding Name}" Value="Transparent">
+                           <Setter Property="Fill" Value="{StaticResource CheckerBrush}" />
+                        </DataTrigger>
+                     </Style.Triggers>
+                  </Style>
+               </Rectangle.Style>
+            </Rectangle>
+         </Border>
+      </Grid>
+   </DataTemplate>
+
+   <Style x:Key="ColorPickerToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                        <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                     </Border>
+
+                     <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                          Grid.Column="1"
+                                          CornerRadius="0,2.75,2.75,0"
+                                          RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
+                                          RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
+											         RenderMouseOver="{TemplateBinding IsMouseOver}"
+											         RenderPressed="{TemplateBinding IsPressed}">
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                        </Grid>
+                     </chrome:ButtonChrome>
+                  </Grid>
+
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ColorDisplayStyle" TargetType="Border">
+      <Setter Property="Background" Value="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+      <Style.Triggers>
+         <DataTrigger Binding="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" Value="Transparent">
+            <Setter Property="Background" Value="{StaticResource CheckerBrush}" />
+         </DataTrigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="ColorListStyle" TargetType="ListBox">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="ItemsPanel">
+         <Setter.Value>
+            <ItemsPanelTemplate>
+               <WrapPanel Width="200" />
+            </ItemsPanelTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="ItemContainerStyle" Value="{StaticResource ColorItemContainerStyle}" />
+      <Setter Property="ItemTemplate" Value="{StaticResource ColorItemTemplate}" />
+      <Setter Property="SelectionMode" Value="Single" />
+   </Style>
+
+   <Style TargetType="{x:Type local:ColorPicker}">
+      <Setter Property="Background" Value="White" />
+      <Setter Property="BorderBrush" Value="{StaticResource ColorPickerDarkBorderBrush}" />
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="ButtonStyle" Value="{StaticResource ColorPickerToggleButtonStyle}" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ColorPicker}">
+               <Grid>
+                  <ToggleButton x:Name="PART_ColorPickerToggleButton"
+                                IsTabStop="True"
+                                MinHeight="22" 
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                Padding="{TemplateBinding Padding}"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                Style="{TemplateBinding ButtonStyle}">
+                     <Grid Margin="2">
+                        <Border x:Name="ColorOnly" Style="{StaticResource ColorDisplayStyle}" />
+
+                        <Border x:Name="ColorAndName" Background="White" Visibility="Hidden">
+                           <StackPanel Orientation="Horizontal">
+                              <Border HorizontalAlignment="Left" Width="20" Margin="2,1,4,1" Style="{StaticResource ColorDisplayStyle}" BorderThickness="1" BorderBrush="#FFC9CACA" />
+                              <TextBlock Text="{Binding SelectedColorText, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
+                           </StackPanel>
                         </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
-                            <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
-                            <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <DataTemplate x:Key="ColorItemTemplate">
-        <Grid>
-            <Border BorderBrush="#FFC9CACA" BorderThickness="1" Margin="2,2,2,2" >
-                <Rectangle Width="14" Height="14">
-                    <Rectangle.Style>
-                        <Style TargetType="Rectangle">
-                            <Setter Property="Fill" Value="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding Name}" Value="Transparent">
-                                    <Setter Property="Fill" Value="{StaticResource CheckerBrush}" />
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </Rectangle.Style>
-                </Rectangle>
-            </Border>
-        </Grid>
-    </DataTemplate>
-
-    <Style x:Key="ColorPickerToggleButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Grid SnapsToDevicePixels="True">
+                     </Grid>
+                  </ToggleButton>
 
+                  <Popup x:Name="PART_ColorPickerPalettePopup" VerticalAlignment="Bottom" IsOpen="{Binding ElementName=PART_ColorPickerToggleButton, Path=IsChecked}" StaysOpen="False" AllowsTransparency="True" Focusable="False" HorizontalOffset="1" VerticalOffset="1" PopupAnimation="Slide">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource ColorPickerDarkBorderBrush}" Padding="3">
                         <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-
-                            <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-                                <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-                            </Border>
-
-                            <chrome:ButtonChrome x:Name="ToggleButtonChrome" Grid.Column="1"
-                                             CornerRadius="0,2.75,2.75,0"
-                                            RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
-                                            RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
-											RenderMouseOver="{TemplateBinding IsMouseOver}"
-											RenderPressed="{TemplateBinding IsPressed}" >
-
-                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
-                                    <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                </Grid>
-                            </chrome:ButtonChrome>
-                        </Grid>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition />
+                              <RowDefinition Height="Auto" />
+                           </Grid.RowDefinitions>
 
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ColorDisplayStyle" TargetType="Border">
-        <Setter Property="Background" Value="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" Value="Transparent">
-                <Setter Property="Background" Value="{StaticResource CheckerBrush}" />
-            </DataTrigger>
-        </Style.Triggers>
-    </Style>
-    
-    <Style x:Key="ColorListStyle" TargetType="ListBox">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" /> 
-        <Setter Property="ItemsPanel">
-            <Setter.Value>
-                <ItemsPanelTemplate>
-                    <WrapPanel Width="200" />
-                </ItemsPanelTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ItemContainerStyle" Value="{StaticResource ColorItemContainerStyle}" />
-        <Setter Property="ItemTemplate" Value="{StaticResource ColorItemTemplate}" />
-        <Setter Property="SelectionMode" Value="Single" />
-    </Style>
-
-    <Style TargetType="{x:Type local:ColorPicker}">
-        <Setter Property="Background" Value="White" />
-        <Setter Property="BorderBrush" Value="{StaticResource ColorPickerDarkBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1,1,0,1" />
-        <Setter Property="ButtonStyle" Value="{StaticResource ColorPickerToggleButtonStyle}" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:ColorPicker}">
-                    <Grid>
-                        <ToggleButton x:Name="PART_ColorPickerToggleButton" IsTabStop="True" MinHeight="22" 
-                                      Background="{TemplateBinding Background}" 
-                                      BorderBrush="{TemplateBinding BorderBrush}" 
-                                      BorderThickness="{TemplateBinding BorderThickness}" 
-                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                      Padding="{TemplateBinding Padding}"
-                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                      Style="{TemplateBinding ButtonStyle}">
-                            <Grid Margin="2">
-                                <Border x:Name="ColorOnly" Style="{StaticResource ColorDisplayStyle}" />
-
-                                <Border x:Name="ColorAndName" Background="White" Visibility="Hidden">
-                                    <StackPanel Orientation="Horizontal">
-                                        <Border HorizontalAlignment="Left" Width="20" Margin="2,1,4,1" Style="{StaticResource ColorDisplayStyle}" BorderThickness="1" BorderBrush="#FFC9CACA" />
-                                        <TextBlock Text="{Binding SelectedColorText, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
-                                    </StackPanel>
-                                </Border>
-                            </Grid>
-                        </ToggleButton>
-
-                        <Popup x:Name="PART_ColorPickerPalettePopup"  VerticalAlignment="Bottom" IsOpen="{Binding ElementName=PART_ColorPickerToggleButton, Path=IsChecked}" StaysOpen="False" AllowsTransparency="True" Focusable="False"  HorizontalOffset="1" VerticalOffset="1" PopupAnimation="Slide"  >
-                            <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource ColorPickerDarkBorderBrush}" Padding="3">
-                                <Grid>
+                           <Grid x:Name="_gridStandardColorsHost" Margin="4">
+                              <Grid.RowDefinitions>
+                                 <RowDefinition Height="Auto" />
+                                 <RowDefinition Height="Auto" />
+                                 <RowDefinition Height="Auto" />
+                                 <RowDefinition Height="Auto" />
+                              </Grid.RowDefinitions>
+
+                              <!-- Available Colors -->
+                              <Grid Grid.Row="1" Visibility="{TemplateBinding ShowAvailableColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                 <Grid>
                                     <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition />
-                                        <RowDefinition Height="Auto" />
+                                       <RowDefinition Height="Auto" />
+                                       <RowDefinition />
                                     </Grid.RowDefinitions>
+                                    <TextBlock Text="{TemplateBinding AvailableColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,0,0,1" />
+                                    <ListBox x:Name="PART_AvailableColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Style="{StaticResource ColorListStyle}" />
+                                 </Grid>
+                              </Grid>
 
-                                    <Grid x:Name="_gridStandardColorsHost" Margin="4">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                        </Grid.RowDefinitions>
-
-                                        <!-- Available Colors -->
-                                        <Grid Grid.Row="1" Visibility="{TemplateBinding ShowAvailableColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                            <Grid>
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition Height="Auto" />
-                                                    <RowDefinition />
-                                                </Grid.RowDefinitions>
-                                                <TextBlock Text="{TemplateBinding AvailableColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,0,0,1" />
-                                                <ListBox x:Name="PART_AvailableColors" Grid.Row="1"
-                                                         ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                                         Style="{StaticResource ColorListStyle}" />
-                                            </Grid>
-                                        </Grid>
-
-                                        <!-- Standard Colors-->
-                                        <Grid Grid.Row="2" Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                            <Grid>
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition Height="Auto" />
-                                                    <RowDefinition Height="Auto" />
-                                                </Grid.RowDefinitions>
-                                                <TextBlock Text="{TemplateBinding StandardColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1"/>
-                                                <ListBox x:Name="PART_StandardColors" Grid.Row="1"
-                                                         ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"                                                      
-                                                         Style="{StaticResource ColorListStyle}" />
-                                            </Grid>
-                                        </Grid>
-
-                                        <!-- Recent Colors-->
-                                        <Grid Grid.Row="3" Margin="0,1,0,1" Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                            <Grid>
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition Height="Auto" />
-                                                    <RowDefinition Height="Auto" />
-                                                </Grid.RowDefinitions>
-                                                <TextBlock Text="{TemplateBinding RecentColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1"/>
-                                                <ListBox x:Name="PART_RecentColors" Grid.Row="1"
-                                                         ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                                         Style="{StaticResource ColorListStyle}" />
-                                            </Grid>
-                                        </Grid>
-                                    </Grid>
-
-                                    <!-- ColorCanvas -->
-                                    <Grid x:Name="_colorCanvasHost" Visibility="Collapsed">
-                                        <local:ColorCanvas x:Name="PART_ColorCanvas" Background="Transparent" BorderThickness="0"
-                                                           SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" />
-                                    </Grid>
-                                    
-                                    <Separator Grid.Row="1" HorizontalAlignment="Stretch" Margin="5,0,5,0" />
-
-                                    <!-- More Colors Button -->
-                                    <ToggleButton x:Name="_colorMode" Grid.Row="2" Content="Advanced" Margin="5" Visibility="{TemplateBinding ShowAdvancedButton, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                                </Grid>
-                            </Border>
-                        </Popup>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="DisplayColorAndName" Value="True">
-                            <Setter TargetName="ColorOnly" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ColorAndName" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                        <Trigger SourceName="_colorMode" Property="IsChecked" Value="True">
-                            <Setter TargetName="_colorMode" Property="Content" Value="Standard" />
-                            <Setter TargetName="_colorCanvasHost" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="_gridStandardColorsHost" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                              <!-- Standard Colors-->
+                              <Grid Grid.Row="2" Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                 <Grid>
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition Height="Auto" />
+                                       <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Text="{TemplateBinding StandardColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
+                                    <ListBox x:Name="PART_StandardColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"                                                      
+                                             Style="{StaticResource ColorListStyle}" />
+                                 </Grid>
+                              </Grid>
+
+                              <!-- Recent Colors-->
+                              <Grid Grid.Row="3" Margin="0,1,0,1" Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                 <Grid>
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition Height="Auto" />
+                                       <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Text="{TemplateBinding RecentColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
+                                    <ListBox x:Name="PART_RecentColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Style="{StaticResource ColorListStyle}" />
+                                 </Grid>
+                              </Grid>
+                           </Grid>
+
+                           <!-- ColorCanvas -->
+                           <Grid x:Name="_colorCanvasHost" Visibility="Collapsed">
+                              <local:ColorCanvas x:Name="PART_ColorCanvas"
+                                                 Background="Transparent"
+                                                 BorderThickness="0"
+                                                 SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" />
+                           </Grid>
+
+                           <Separator Grid.Row="1" HorizontalAlignment="Stretch" Margin="5,0,5,0" />
+
+                           <!-- More Colors Button -->
+                           <ToggleButton x:Name="_colorMode" Grid.Row="2" Content="Advanced" Margin="5" Visibility="{TemplateBinding ShowAdvancedButton, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                        </Grid>
+                     </Border>
+                  </Popup>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="DisplayColorAndName" Value="True">
+                     <Setter TargetName="ColorOnly" Property="Visibility" Value="Collapsed" />
+                     <Setter TargetName="ColorAndName" Property="Visibility" Value="Visible" />
+                  </Trigger>
+                  <Trigger SourceName="_colorMode" Property="IsChecked" Value="True">
+                     <Setter TargetName="_colorMode" Property="Content" Value="Standard" />
+                     <Setter TargetName="_colorCanvasHost" Property="Visibility" Value="Visible" />
+                     <Setter TargetName="_gridStandardColorsHost" Property="Visibility" Value="Collapsed" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
index 9b9b2b76..204e0b66 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/CalculatorMemoryToVisibilityConverter.cs
@@ -1,19 +1,37 @@
-using System;
-using System.Windows.Data;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
+using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls.Core.Converters
 {
-    public class CalculatorMemoryToVisibilityConverter : IValueConverter
+  public class CalculatorMemoryToVisibilityConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return ( decimal )value == decimal.Zero ? Visibility.Hidden : Visibility.Visible;
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            return (decimal)value == decimal.Zero ? Visibility.Hidden : Visibility.Visible;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+      throw new NotImplementedException();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs
index 6bb19191..6a0a83a6 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ColorToSolidColorBrushConverter.cs
@@ -1,51 +1,69 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System;
 using System.Windows.Data;
 using System.Windows.Media;
 
 namespace Microsoft.Windows.Controls.Core.Converters
 {
-    public class ColorToSolidColorBrushConverter : IValueConverter
+  public class ColorToSolidColorBrushConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    /// <summary>
+    /// Converts a Color to a SolidColorBrush.
+    /// </summary>
+    /// <param name="value">The Color produced by the binding source.</param>
+    /// <param name="targetType">The type of the binding target property.</param>
+    /// <param name="parameter">The converter parameter to use.</param>
+    /// <param name="culture">The culture to use in the converter.</param>
+    /// <returns>
+    /// A converted SolidColorBrush. If the method returns null, the valid null value is used.
+    /// </returns>
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
-        #region IValueConverter Members
-
-        /// <summary>
-        /// Converts a Color to a SolidColorBrush.
-        /// </summary>
-        /// <param name="value">The Color produced by the binding source.</param>
-        /// <param name="targetType">The type of the binding target property.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>
-        /// A converted SolidColorBrush. If the method returns null, the valid null value is used.
-        /// </returns>
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (value != null)
-                return new SolidColorBrush((Color)value);
-
-            return value;
-        }
-
-
-        /// <summary>
-        /// Converts a SolidColorBrush to a Color.
-        /// </summary>
-        /// <remarks>Currently not used in toolkit, but provided for developer use in their own projects</remarks>
-        /// <param name="value">The SolidColorBrush that is produced by the binding target.</param>
-        /// <param name="targetType">The type to convert to.</param>
-        /// <param name="parameter">The converter parameter to use.</param>
-        /// <param name="culture">The culture to use in the converter.</param>
-        /// <returns>
-        /// A converted value. If the method returns null, the valid null value is used.
-        /// </returns>
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (value != null)
-				return ((SolidColorBrush)value).Color;
-
-            return value;
-        }
-
-        #endregion
+      if( value != null )
+        return new SolidColorBrush( ( Color )value );
+
+      return value;
     }
+
+
+    /// <summary>
+    /// Converts a SolidColorBrush to a Color.
+    /// </summary>
+    /// <remarks>Currently not used in toolkit, but provided for developer use in their own projects</remarks>
+    /// <param name="value">The SolidColorBrush that is produced by the binding target.</param>
+    /// <param name="targetType">The type to convert to.</param>
+    /// <param name="parameter">The converter parameter to use.</param>
+    /// <param name="culture">The culture to use in the converter.</param>
+    /// <returns>
+    /// A converted value. If the method returns null, the valid null value is used.
+    /// </returns>
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value != null )
+        return ( ( SolidColorBrush )value ).Color;
+
+      return value;
+    }
+
+    #endregion
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs
index 2bcdc0fe..2a13706c 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/InverseBoolConverter.cs
@@ -1,22 +1,40 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls.Core.Converters
 {
-    public class InverseBoolConverter : IValueConverter
-    {
-        #region IValueConverter Members
-
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            return !(bool)value;
-        }
+  public class InverseBoolConverter : IValueConverter
+  {
+    #region IValueConverter Members
 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return !( bool )value;
+    }
 
-        #endregion
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
     }
+
+    #endregion
+  }
 }
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs
index 70932391..f0351726 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/ObjectTypeToNameConverter.cs
@@ -1,17 +1,35 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System;
 using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls.Core.Converters
 {
-    public class ObjectTypeToNameConverter : IValueConverter
+  public class ObjectTypeToNameConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return value.GetType().Name;
+    }
+    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)
-        {
-            return value.GetType().Name;
-        }
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+      throw new NotImplementedException();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs
index 901f235b..79fb159d 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/SolidColorBrushToColorConverter.cs
@@ -1,33 +1,51 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows.Data;
 using System.Windows.Media;
 
 namespace Microsoft.Windows.Controls.Core.Converters
 {
-    public class SolidColorBrushToColorConverter : IValueConverter
-    {
-        #region IValueConverter Members
-
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            SolidColorBrush brush = value as SolidColorBrush;
-            if (brush != null)
-                return brush.Color;
+  public class SolidColorBrushToColorConverter : IValueConverter
+  {
+    #region IValueConverter Members
 
-            return default(Color);
-        }
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      SolidColorBrush brush = value as SolidColorBrush;
+      if( brush != null )
+        return brush.Color;
 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            if (value != null)
-            {
-                Color color = (Color)value;
-                return new SolidColorBrush(color);
-            }
+      return default( Color );
+    }
 
-            return default(SolidColorBrush);
-        }
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      if( value != null )
+      {
+        Color color = ( Color )value;
+        return new SolidColorBrush( color );
+      }
 
-        #endregion
+      return default( SolidColorBrush );
     }
+
+    #endregion
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs
index 6eda8ab7..58256236 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/TimeFormatToDateTimeFormatConverter.cs
@@ -1,33 +1,51 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls.Core.Converters
 {
-    public class TimeFormatToDateTimeFormatConverter : IValueConverter
+  public class TimeFormatToDateTimeFormatConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
-        #region IValueConverter Members
-
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            TimeFormat timeFormat = (TimeFormat)value;
-            switch (timeFormat)
-            {
-                case TimeFormat.Custom:
-                    return DateTimeFormat.Custom;
-                case TimeFormat.ShortTime:
-                    return DateTimeFormat.ShortTime;
-                case TimeFormat.LongTime:
-                    return DateTimeFormat.LongTime;
-                default:
-                    return DateTimeFormat.ShortTime;
-            }
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-
-        #endregion
+      TimeFormat timeFormat = ( TimeFormat )value;
+      switch( timeFormat )
+      {
+        case TimeFormat.Custom:
+          return DateTimeFormat.Custom;
+        case TimeFormat.ShortTime:
+          return DateTimeFormat.ShortTime;
+        case TimeFormat.LongTime:
+          return DateTimeFormat.LongTime;
+        default:
+          return DateTimeFormat.ShortTime;
+      }
     }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs
index a0589d60..40dc0241 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Converters/WizardPageButtonVisibilityConverter.cs
@@ -1,40 +1,58 @@
-using System;
-using System.Windows.Data;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
+using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls.Core.Converters
 {
-    public class WizardPageButtonVisibilityConverter : IMultiValueConverter
+  public class WizardPageButtonVisibilityConverter : IMultiValueConverter
+  {
+    public object Convert( object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      Visibility wizardVisibility = ( Visibility )values[ 0 ];
+      WizardPageButtonVisibility wizardPageVisibility = ( WizardPageButtonVisibility )values[ 1 ];
+
+      Visibility visibility = Visibility.Visible;
+
+      switch( wizardPageVisibility )
+      {
+        case WizardPageButtonVisibility.Inherit:
+          visibility = wizardVisibility;
+          break;
+        case WizardPageButtonVisibility.Collapsed:
+          visibility = Visibility.Collapsed;
+          break;
+        case WizardPageButtonVisibility.Hidden:
+          visibility = Visibility.Hidden;
+          break;
+        case WizardPageButtonVisibility.Visible:
+          visibility = Visibility.Visible;
+          break;
+      }
+
+      return visibility;
+    }
+
+    public object[] ConvertBack( object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture )
     {
-        public object Convert(object[] values, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            Visibility wizardVisibility = (Visibility)values[0];
-            WizardPageButtonVisibility wizardPageVisibility = (WizardPageButtonVisibility)values[1];
-
-            Visibility visibility = Visibility.Visible;
-
-            switch (wizardPageVisibility)
-            {
-                case WizardPageButtonVisibility.Inherit:
-                    visibility = wizardVisibility;
-                    break;
-                case WizardPageButtonVisibility.Collapsed:
-                    visibility = Visibility.Collapsed;
-                    break;
-                case WizardPageButtonVisibility.Hidden:
-                    visibility = Visibility.Hidden;
-                    break;
-                case WizardPageButtonVisibility.Visible:
-                    visibility = Visibility.Visible;
-                    break;
-            }
-
-            return visibility;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+      throw new NotImplementedException();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs
index 4756686c..4398fd47 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/HsvColor.cs
@@ -1,18 +1,35 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls.Primitives
 {
-    internal struct HsvColor
+  internal struct HsvColor
+  {
+    public double H;
+    public double S;
+    public double V;
+
+    public HsvColor( double h, double s, double v )
     {
-        public double H;
-        public double S;
-        public double V;
-
-        public HsvColor(double h, double s, double v)
-        {
-            H = h;
-            S = s;
-            V = v;
-        }
+      H = h;
+      S = s;
+      V = v;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs
index cfe0c62f..83534992 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/InputBase.cs
@@ -1,105 +1,159 @@
-using System;
-using System.Windows.Controls;
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
 
 namespace Microsoft.Windows.Controls.Primitives
 {
-    public abstract class InputBase : Control
-    {
-        #region Properties
+  public abstract class InputBase : Control
+  {
+    #region Properties
 
-        #region CultureInfo
+    #region CultureInfo
 
-        public static readonly DependencyProperty CultureInfoProperty = DependencyProperty.Register("CultureInfo", typeof(CultureInfo), typeof(InputBase), new UIPropertyMetadata(CultureInfo.CurrentCulture, OnCultureInfoChanged));
-        public CultureInfo CultureInfo
-        {
-            get { return (CultureInfo)GetValue(CultureInfoProperty); }
-            set { SetValue(CultureInfoProperty, value); }
-        }
+    public static readonly DependencyProperty CultureInfoProperty = DependencyProperty.Register( "CultureInfo", typeof( CultureInfo ), typeof( InputBase ), new UIPropertyMetadata( CultureInfo.CurrentCulture, OnCultureInfoChanged ) );
+    public CultureInfo CultureInfo
+    {
+      get
+      {
+        return ( CultureInfo )GetValue( CultureInfoProperty );
+      }
+      set
+      {
+        SetValue( CultureInfoProperty, value );
+      }
+    }
 
-        private static void OnCultureInfoChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            InputBase inputBase = o as InputBase;
-            if (inputBase != null)
-                inputBase.OnCultureInfoChanged((CultureInfo)e.OldValue, (CultureInfo)e.NewValue);
-        }
+    private static void OnCultureInfoChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      InputBase inputBase = o as InputBase;
+      if( inputBase != null )
+        inputBase.OnCultureInfoChanged( ( CultureInfo )e.OldValue, ( CultureInfo )e.NewValue );
+    }
 
-        protected virtual void OnCultureInfoChanged(CultureInfo oldValue, CultureInfo newValue)
-        {
+    protected virtual void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
+    {
 
-        }
+    }
 
-        #endregion //CultureInfo
+    #endregion //CultureInfo
 
-        #region IsReadOnly
+    #region IsReadOnly
 
-        public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register("IsReadOnly", typeof(bool), typeof(InputBase), new UIPropertyMetadata(false));
-        public bool IsReadOnly
-        {
-            get { return (bool)GetValue(IsReadOnlyProperty); }
-            set { SetValue(IsReadOnlyProperty, value); }
-        }
+    public static readonly DependencyProperty IsReadOnlyProperty = DependencyProperty.Register( "IsReadOnly", typeof( bool ), typeof( InputBase ), new UIPropertyMetadata( false ) );
+    public bool IsReadOnly
+    {
+      get
+      {
+        return ( bool )GetValue( IsReadOnlyProperty );
+      }
+      set
+      {
+        SetValue( IsReadOnlyProperty, value );
+      }
+    }
 
-        #endregion //IsReadOnly        
+    #endregion //IsReadOnly
 
-        #region Text
+    #region Text
 
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(InputBase), new UIPropertyMetadata(default(String), OnTextChanged));
-        public string Text
-        {
-            get { return (string)GetValue(TextProperty); }
-            set { SetValue(TextProperty, value); }
-        }
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( InputBase ), new UIPropertyMetadata( default( String ), OnTextChanged ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
 
-        private static void OnTextChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            InputBase inputBase = o as InputBase;
-            if (inputBase != null)
-                inputBase.OnTextChanged((string)e.OldValue, (string)e.NewValue);
-        }
+    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      InputBase inputBase = o as InputBase;
+      if( inputBase != null )
+        inputBase.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
 
-        protected virtual void OnTextChanged(string oldValue, string newValue)
-        {
+    protected virtual void OnTextChanged( string oldValue, string newValue )
+    {
 
-        }
+    }
 
-        #endregion //Text
+    #endregion //Text
 
-        #region TextAlignment
+    #region TextAlignment
 
-        public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register("TextAlignment", typeof(TextAlignment), typeof(InputBase), new UIPropertyMetadata(TextAlignment.Left));
-        public TextAlignment TextAlignment
-        {
-            get { return (TextAlignment)GetValue(TextAlignmentProperty); }
-            set { SetValue(TextAlignmentProperty, value); }
-        }
+    public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register( "TextAlignment", typeof( TextAlignment ), typeof( InputBase ), new UIPropertyMetadata( TextAlignment.Left ) );
+    public TextAlignment TextAlignment
+    {
+      get
+      {
+        return ( TextAlignment )GetValue( TextAlignmentProperty );
+      }
+      set
+      {
+        SetValue( TextAlignmentProperty, value );
+      }
+    }
 
 
-        #endregion //TextAlignment
+    #endregion //TextAlignment
 
-        #region Watermark
+    #region Watermark
 
-        public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register("Watermark", typeof(object), typeof(InputBase), new UIPropertyMetadata(null));
-        public object Watermark
-        {
-            get { return (object)GetValue(WatermarkProperty); }
-            set { SetValue(WatermarkProperty, value); }
-        }
+    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( InputBase ), new UIPropertyMetadata( null ) );
+    public object Watermark
+    {
+      get
+      {
+        return ( object )GetValue( WatermarkProperty );
+      }
+      set
+      {
+        SetValue( WatermarkProperty, value );
+      }
+    }
 
-        #endregion //Watermark
+    #endregion //Watermark
 
-        #region WatermarkTemplate
+    #region WatermarkTemplate
 
-        public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register("WatermarkTemplate", typeof(DataTemplate), typeof(InputBase), new UIPropertyMetadata(null));
-        public DataTemplate WatermarkTemplate
-        {
-            get { return (DataTemplate)GetValue(WatermarkTemplateProperty); }
-            set { SetValue(WatermarkTemplateProperty, value); }
-        }
+    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( InputBase ), new UIPropertyMetadata( null ) );
+    public DataTemplate WatermarkTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
+      }
+      set
+      {
+        SetValue( WatermarkTemplateProperty, value );
+      }
+    }
 
-        #endregion //WatermarkTemplate
+    #endregion //WatermarkTemplate
 
-        #endregion //Properties
-    }
+    #endregion //Properties
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs
index dd89a41d..66338f4a 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/Selector.cs
@@ -1,4 +1,22 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Collections;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -10,371 +28,427 @@ using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls.Primitives
 {
-    public class Selector : ItemsControl //should probably make this control an ICommandSource
-    {
-        #region Members
-
-        private bool _ignoreSetSelectedValue;
-        private bool _surpressSelectionChanged;
-        private bool _surpressSelectedValueChanged;
+  public class Selector : ItemsControl //should probably make this control an ICommandSource
+  {
+    #region Members
 
-        #endregion //Members
+    private bool _ignoreSetSelectedValue;
+    private bool _surpressSelectionChanged;
+    private bool _surpressSelectedValueChanged;
 
-        #region Constructors
+    #endregion //Members
 
-        public Selector()
-        {
-            SelectedItems = new ObservableCollection<object>();
-            AddHandler(Selector.SelectedEvent, new RoutedEventHandler(Selector_ItemSelected));
-            AddHandler(Selector.UnSelectedEvent, new RoutedEventHandler(Selector_ItemUnselected));
-        }
+    #region Constructors
 
-        #endregion //Constructors
+    public Selector()
+    {
+      SelectedItems = new ObservableCollection<object>();
+      AddHandler( Selector.SelectedEvent, new RoutedEventHandler( Selector_ItemSelected ) );
+      AddHandler( Selector.UnSelectedEvent, new RoutedEventHandler( Selector_ItemUnselected ) );
+    }
 
-        #region Properties
+    #endregion //Constructors
 
-        public static readonly DependencyProperty CommandProperty = DependencyProperty.Register("Command", typeof(ICommand), typeof(Selector), new PropertyMetadata((ICommand)null));
-        [TypeConverter(typeof(CommandConverter))]
-        public ICommand Command
-        {
-            get { return (ICommand)GetValue(CommandProperty); }
-            set { SetValue(CommandProperty, value); }
-        }
+    #region Properties
 
-        public static readonly DependencyProperty DelimiterProperty = DependencyProperty.Register("Delimiter", typeof(string), typeof(Selector), new UIPropertyMetadata(","));
-        public string Delimiter
-        {
-            get { return (string)GetValue(DelimiterProperty); }
-            set { SetValue(DelimiterProperty, value); }
-        }
-
-        public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register("SelectedItem", typeof(object), typeof(Selector), new UIPropertyMetadata(null));
-        public object SelectedItem
-        {
-            get { return (object)GetValue(SelectedItemProperty); }
-            set { SetValue(SelectedItemProperty, value); }
-        }
+    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register( "Command", typeof( ICommand ), typeof( Selector ), new PropertyMetadata( ( ICommand )null ) );
+    [TypeConverter( typeof( CommandConverter ) )]
+    public ICommand Command
+    {
+      get
+      {
+        return ( ICommand )GetValue( CommandProperty );
+      }
+      set
+      {
+        SetValue( CommandProperty, value );
+      }
+    }
 
-        //Since you cannot data bind to ReadOnly DependencyProperty, I am leaving this a public get/set DP.  This will allow you to data bind to the SelectedItems from a ViewModel, but it is
-        //intended to be ReadOnly.  So you MUST set the binding Mode=OneWayToSource.  Otherwise it will not behave as expected.
-        public static readonly DependencyProperty SelectedItemsProperty = DependencyProperty.Register("SelectedItems", typeof(IList), typeof(Selector), new UIPropertyMetadata(null));
-        public IList SelectedItems
-        {
-            get { return (IList)GetValue(SelectedItemsProperty); }
-            set { SetValue(SelectedItemsProperty, value); }
-        }
+    public static readonly DependencyProperty DelimiterProperty = DependencyProperty.Register( "Delimiter", typeof( string ), typeof( Selector ), new UIPropertyMetadata( "," ) );
+    public string Delimiter
+    {
+      get
+      {
+        return ( string )GetValue( DelimiterProperty );
+      }
+      set
+      {
+        SetValue( DelimiterProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty SelectedMemberPathProperty = DependencyProperty.Register("SelectedMemberPath", typeof(string), typeof(Selector), new UIPropertyMetadata(null));
-        public string SelectedMemberPath
-        {
-            get { return (string)GetValue(SelectedMemberPathProperty); }
-            set { SetValue(SelectedMemberPathProperty, value); }
-        }
+    public static readonly DependencyProperty SelectedItemProperty = DependencyProperty.Register( "SelectedItem", typeof( object ), typeof( Selector ), new UIPropertyMetadata( null ) );
+    public object SelectedItem
+    {
+      get
+      {
+        return ( object )GetValue( SelectedItemProperty );
+      }
+      set
+      {
+        SetValue( SelectedItemProperty, value );
+      }
+    }
 
-        #region SelectedValue
+    //Since you cannot data bind to ReadOnly DependencyProperty, I am leaving this a public get/set DP.  This will allow you to data bind to the SelectedItems from a ViewModel, but it is
+    //intended to be ReadOnly.  So you MUST set the binding Mode=OneWayToSource.  Otherwise it will not behave as expected.
+    public static readonly DependencyProperty SelectedItemsProperty = DependencyProperty.Register( "SelectedItems", typeof( IList ), typeof( Selector ), new UIPropertyMetadata( null ) );
+    public IList SelectedItems
+    {
+      get
+      {
+        return ( IList )GetValue( SelectedItemsProperty );
+      }
+      set
+      {
+        SetValue( SelectedItemsProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty SelectedValueProperty = DependencyProperty.Register("SelectedValue", typeof(string), typeof(Selector), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedValueChanged));
-        public string SelectedValue
-        {
-            get { return (string)GetValue(SelectedValueProperty); }
-            set { SetValue(SelectedValueProperty, value); }
-        }
+    public static readonly DependencyProperty SelectedMemberPathProperty = DependencyProperty.Register( "SelectedMemberPath", typeof( string ), typeof( Selector ), new UIPropertyMetadata( null ) );
+    public string SelectedMemberPath
+    {
+      get
+      {
+        return ( string )GetValue( SelectedMemberPathProperty );
+      }
+      set
+      {
+        SetValue( SelectedMemberPathProperty, value );
+      }
+    }
 
-        private static void OnSelectedValueChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            Selector selector = o as Selector;
-            if (selector != null)
-                selector.OnSelectedValueChanged((string)e.OldValue, (string)e.NewValue);
-        }
+    #region SelectedValue
 
-        protected virtual void OnSelectedValueChanged(string oldValue, string newValue)
-        {
-            if (_surpressSelectedValueChanged)
-                return;
+    public static readonly DependencyProperty SelectedValueProperty = DependencyProperty.Register( "SelectedValue", typeof( string ), typeof( Selector ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnSelectedValueChanged ) );
+    public string SelectedValue
+    {
+      get
+      {
+        return ( string )GetValue( SelectedValueProperty );
+      }
+      set
+      {
+        SetValue( SelectedValueProperty, value );
+      }
+    }
 
-            UpdateSelectedItemsFromSelectedValue();
-        }
+    private static void OnSelectedValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Selector selector = o as Selector;
+      if( selector != null )
+        selector.OnSelectedValueChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
 
-        #endregion //SelectedValue
+    protected virtual void OnSelectedValueChanged( string oldValue, string newValue )
+    {
+      if( _surpressSelectedValueChanged )
+        return;
 
-        public static readonly DependencyProperty ValueMemberPathProperty = DependencyProperty.Register("ValueMemberPath", typeof(string), typeof(Selector), new UIPropertyMetadata(null));
-        public string ValueMemberPath
-        {
-            get { return (string)GetValue(ValueMemberPathProperty); }
-            set { SetValue(ValueMemberPathProperty, value); }
-        }
+      UpdateSelectedItemsFromSelectedValue();
+    }
 
-        #endregion //Properties
+    #endregion //SelectedValue
 
-        #region Base Class Overrides
+    public static readonly DependencyProperty ValueMemberPathProperty = DependencyProperty.Register( "ValueMemberPath", typeof( string ), typeof( Selector ), new UIPropertyMetadata( null ) );
+    public string ValueMemberPath
+    {
+      get
+      {
+        return ( string )GetValue( ValueMemberPathProperty );
+      }
+      set
+      {
+        SetValue( ValueMemberPathProperty, value );
+      }
+    }
 
-        protected override bool IsItemItsOwnContainerOverride(object item)
-        {
-            return item is SelectorItem;
-        }
+    #endregion //Properties
 
-        protected override DependencyObject GetContainerForItemOverride()
-        {
-            return new SelectorItem();
-        }
+    #region Base Class Overrides
 
-        protected override void PrepareContainerForItemOverride(DependencyObject element, object item)
-        {
-            _surpressSelectionChanged = true;
-            var selectorItem = element as FrameworkElement;
+    protected override bool IsItemItsOwnContainerOverride( object item )
+    {
+      return item is SelectorItem;
+    }
 
-            //first try resolving SelectorItem.IsSelected by data binding to the SelectedMemeberPath property
-            if (!String.IsNullOrEmpty(SelectedMemberPath))
-            {
-                Binding selectedBinding = new Binding(SelectedMemberPath)
-                {
-                    Mode = BindingMode.TwoWay,
-                    Source = item
-                };
-                selectorItem.SetBinding(SelectorItem.IsSelectedProperty, selectedBinding);
-            }
+    protected override DependencyObject GetContainerForItemOverride()
+    {
+      return new SelectorItem();
+    }
 
-            //now let's search the SelectedItems for the current item.  If it's there then mark it as selected
-            if (SelectedItems != null)
-            {
-                foreach (object selectedItem in SelectedItems)
-                {
-                    //a match was found so select it and get the hell out of here
-                    if (item.Equals(selectedItem))
-                    {
-                        selectorItem.SetValue(SelectorItem.IsSelectedProperty, true);
-                        break;
-                    }
-                }
-            }
+    protected override void PrepareContainerForItemOverride( DependencyObject element, object item )
+    {
+      _surpressSelectionChanged = true;
+      var selectorItem = element as FrameworkElement;
 
-            base.PrepareContainerForItemOverride(element, item);
-            _surpressSelectionChanged = false;
+      //first try resolving SelectorItem.IsSelected by data binding to the SelectedMemeberPath property
+      if( !String.IsNullOrEmpty( SelectedMemberPath ) )
+      {
+        Binding selectedBinding = new Binding( SelectedMemberPath )
+        {
+          Mode = BindingMode.TwoWay,
+          Source = item
+        };
+        selectorItem.SetBinding( SelectorItem.IsSelectedProperty, selectedBinding );
+      }
+
+      //now let's search the SelectedItems for the current item.  If it's there then mark it as selected
+      if( SelectedItems != null )
+      {
+        foreach( object selectedItem in SelectedItems )
+        {
+          //a match was found so select it and get the hell out of here
+          if( item.Equals( selectedItem ) )
+          {
+            selectorItem.SetValue( SelectorItem.IsSelectedProperty, true );
+            break;
+          }
         }
+      }
 
-        #endregion //Base Class Overrides
-
-        #region Events
+      base.PrepareContainerForItemOverride( element, item );
+      _surpressSelectionChanged = false;
+    }
 
-        public static readonly RoutedEvent SelectedEvent = EventManager.RegisterRoutedEvent("SelectedEvent", RoutingStrategy.Bubble, typeof(SelectedItemChangedEventHandler), typeof(Selector));
-        public static readonly RoutedEvent UnSelectedEvent = EventManager.RegisterRoutedEvent("UnSelectedEvent", RoutingStrategy.Bubble, typeof(SelectedItemChangedEventHandler), typeof(Selector));
+    #endregion //Base Class Overrides
 
-        public static readonly RoutedEvent SelectedItemChangedEvent = EventManager.RegisterRoutedEvent("SelectedItemChanged", RoutingStrategy.Bubble, typeof(SelectedItemChangedEventHandler), typeof(Selector));
-        public event SelectedItemChangedEventHandler SelectedItemChanged
-        {
-            add { AddHandler(SelectedItemChangedEvent, value); }
-            remove { RemoveHandler(SelectedItemChangedEvent, value); }
-        }
+    #region Events
 
-        #endregion //Events
+    public static readonly RoutedEvent SelectedEvent = EventManager.RegisterRoutedEvent( "SelectedEvent", RoutingStrategy.Bubble, typeof( SelectedItemChangedEventHandler ), typeof( Selector ) );
+    public static readonly RoutedEvent UnSelectedEvent = EventManager.RegisterRoutedEvent( "UnSelectedEvent", RoutingStrategy.Bubble, typeof( SelectedItemChangedEventHandler ), typeof( Selector ) );
 
-        #region Event Handlers
+    public static readonly RoutedEvent SelectedItemChangedEvent = EventManager.RegisterRoutedEvent( "SelectedItemChanged", RoutingStrategy.Bubble, typeof( SelectedItemChangedEventHandler ), typeof( Selector ) );
+    public event SelectedItemChangedEventHandler SelectedItemChanged
+    {
+      add
+      {
+        AddHandler( SelectedItemChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( SelectedItemChangedEvent, value );
+      }
+    }
 
-        protected virtual void Selector_ItemSelected(object sender, RoutedEventArgs e)
-        {
-            OnItemSelected(e.OriginalSource, false);
-        }
+    #endregion //Events
 
-        protected virtual void Selector_ItemUnselected(object sender, RoutedEventArgs e)
-        {
-            OnItemSelected(e.OriginalSource, true);
-        }
+    #region Event Handlers
 
-        #endregion //Event Handlers
+    protected virtual void Selector_ItemSelected( object sender, RoutedEventArgs e )
+    {
+      OnItemSelected( e.OriginalSource, false );
+    }
 
-        #region Methods
+    protected virtual void Selector_ItemUnselected( object sender, RoutedEventArgs e )
+    {
+      OnItemSelected( e.OriginalSource, true );
+    }
 
-        protected object GetItemValue(object item)
-        {
-            if (!String.IsNullOrEmpty(ValueMemberPath))
-            {
-                var property = item.GetType().GetProperty(ValueMemberPath);
-                if (property != null)
-                    return property.GetValue(item, null);
-            }
+    #endregion //Event Handlers
 
-            return item;
-        }
+    #region Methods
 
-        protected static object GetDataContextItem(object item)
-        {
-            var element = item as FrameworkElement;
+    protected object GetItemValue( object item )
+    {
+      if( !String.IsNullOrEmpty( ValueMemberPath ) )
+      {
+        var property = item.GetType().GetProperty( ValueMemberPath );
+        if( property != null )
+          return property.GetValue( item, null );
+      }
+
+      return item;
+    }
 
-            if (element != null)
-                return element.DataContext;
-            else
-                return null;
-        }
+    protected static object GetDataContextItem( object item )
+    {
+      var element = item as FrameworkElement;
 
-        protected string GetDelimitedValue(object value)
-        {
-            return String.Format("{0}{1}", value, Delimiter);
-        }
+      if( element != null )
+        return element.DataContext;
+      else
+        return null;
+    }
 
-        protected virtual void OnItemSelected(object source, bool remove)
-        {
-            var item = GetDataContextItem(source);
-            Update(item, remove);
-            RaiseSelectedItemChangedEvent(item, !remove); //inverse the remove paramter to correctly reflect the IsSelected state
-        }
+    protected string GetDelimitedValue( object value )
+    {
+      return String.Format( "{0}{1}", value, Delimiter );
+    }
 
-        protected virtual void RaiseSelectedItemChangedEvent(object item, bool isSelected)
-        {
-            if (_surpressSelectionChanged)
-                return;
+    protected virtual void OnItemSelected( object source, bool remove )
+    {
+      var item = GetDataContextItem( source );
+      Update( item, remove );
+      RaiseSelectedItemChangedEvent( item, !remove ); //inverse the remove paramter to correctly reflect the IsSelected state
+    }
 
-            RaiseEvent(new SelectedItemChangedEventArgs(Selector.SelectedItemChangedEvent, this, item, isSelected));
+    protected virtual void RaiseSelectedItemChangedEvent( object item, bool isSelected )
+    {
+      if( _surpressSelectionChanged )
+        return;
 
-            if (Command != null)
-                Command.Execute(item);
-        }
+      RaiseEvent( new SelectedItemChangedEventArgs( Selector.SelectedItemChangedEvent, this, item, isSelected ) );
 
-        protected virtual void Update(object item, bool remove)
-        {
-            UpdateSelectedItem(item);
-            UpdateSelectedItems(item, remove);
-            UpdateSelectedValue();
-        }
+      if( Command != null )
+        Command.Execute( item );
+    }
 
-        private void UpdateSelectedItem(object item)
-        {
-            SelectedItem = item;
-        }
+    protected virtual void Update( object item, bool remove )
+    {
+      UpdateSelectedItem( item );
+      UpdateSelectedItems( item, remove );
+      UpdateSelectedValue();
+    }
 
-        private void UpdateSelectedItems(object item, bool remove)
-        {
-            if (SelectedItems == null)
-                SelectedItems = new ObservableCollection<object>();
+    private void UpdateSelectedItem( object item )
+    {
+      SelectedItem = item;
+    }
 
-            if (remove)
-            {
-                if (SelectedItems.Contains(item))
-                    SelectedItems.Remove(item);
-            }
-            else
-            {
-                if (!SelectedItems.Contains(item))
-                    SelectedItems.Add(item);
-            }
-        }
+    private void UpdateSelectedItems( object item, bool remove )
+    {
+      if( SelectedItems == null )
+        SelectedItems = new ObservableCollection<object>();
+
+      if( remove )
+      {
+        if( SelectedItems.Contains( item ) )
+          SelectedItems.Remove( item );
+      }
+      else
+      {
+        if( !SelectedItems.Contains( item ) )
+          SelectedItems.Add( item );
+      }
+    }
 
-        private void UpdateSelectedValue()
-        {
-            //get out of here if we don't want to set the SelectedValue
-            if (_ignoreSetSelectedValue)
-                return;
+    private void UpdateSelectedValue()
+    {
+      //get out of here if we don't want to set the SelectedValue
+      if( _ignoreSetSelectedValue )
+        return;
 
-            _surpressSelectedValueChanged = true;
+      _surpressSelectedValueChanged = true;
 
 #if VS2008
-            string newValue = String.Join(Delimiter, SelectedItems.Cast<object>().Select(x => GetItemValue(x).ToString()).ToArray());
+      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemValue( x ).ToString() ).ToArray() );
 #else
-            string newValue = String.Join(Delimiter, SelectedItems.Cast<object>().Select(x => GetItemValue(x)));
+      string newValue = String.Join( Delimiter, SelectedItems.Cast<object>().Select( x => GetItemValue( x ) ) );
 #endif
-            if (String.IsNullOrEmpty(SelectedValue) || !SelectedValue.Equals(newValue))
-                SelectedValue = newValue;
+      if( String.IsNullOrEmpty( SelectedValue ) || !SelectedValue.Equals( newValue ) )
+        SelectedValue = newValue;
 
-            _surpressSelectedValueChanged = false;
-        }
+      _surpressSelectedValueChanged = false;
+    }
+
+    private void UpdateSelectedItemsFromSelectedValue()
+    {
+      _surpressSelectionChanged = true;
+
+      //first we have to unselect everything
+      ClearSelectedItems();
 
-        private void UpdateSelectedItemsFromSelectedValue()
+      if( !String.IsNullOrEmpty( SelectedValue ) )
+      {
+        string[] values = SelectedValue.Split( new string[] { Delimiter }, StringSplitOptions.RemoveEmptyEntries );
+        foreach( string value in values )
         {
-            _surpressSelectionChanged = true;
+          var item = ResolveItemByValue( value );
 
-            //first we have to unselect everything
-            ClearSelectedItems();
+          if( item != null )
+          {
+            SelectedItems.Add( item );
 
-            if (!String.IsNullOrEmpty(SelectedValue))
+            //now try to select it in the list
+            var selectorItem = ItemContainerGenerator.ContainerFromItem( item ) as SelectorItem;
+            if( selectorItem != null )
             {
-                string[] values = SelectedValue.Split(new string[] { Delimiter }, StringSplitOptions.RemoveEmptyEntries);
-                foreach (string value in values)
-                {
-                    var item = ResolveItemByValue(value);
-
-                    if (item != null)
-                    {
-                        SelectedItems.Add(item);
-
-                        //now try to select it in the list
-                        var selectorItem = ItemContainerGenerator.ContainerFromItem(item) as SelectorItem;
-                        if (selectorItem != null)
-                        {
-                            if (!selectorItem.IsSelected)
-                                selectorItem.IsSelected = true;
-                        }
-                    }
-                }
+              if( !selectorItem.IsSelected )
+                selectorItem.IsSelected = true;
             }
-
-            _surpressSelectionChanged = false;
+          }
         }
+      }
 
-        private void ClearSelectedItems()
-        {
-            if (SelectedItems != null)
-                SelectedItems.Clear();
-            else
-                SelectedItems = new ObservableCollection<object>();
+      _surpressSelectionChanged = false;
+    }
 
-            UnselectAllInternal();
-        }
+    private void ClearSelectedItems()
+    {
+      if( SelectedItems != null )
+        SelectedItems.Clear();
+      else
+        SelectedItems = new ObservableCollection<object>();
 
-        private void UnselectAllInternal()
-        {
-            _ignoreSetSelectedValue = true;
+      UnselectAllInternal();
+    }
 
-            if (ItemsSource != null)
-            {
-                foreach (object item in ItemsSource)
-                {
-                    var selectorItem = ItemContainerGenerator.ContainerFromItem(item) as SelectorItem;
-                    if (selectorItem != null)
-                    {
-                        if (selectorItem.IsSelected)
-                            selectorItem.IsSelected = false;
-                    }
-                }
-            }
+    private void UnselectAllInternal()
+    {
+      _ignoreSetSelectedValue = true;
 
-            _ignoreSetSelectedValue = false;
+      if( ItemsSource != null )
+      {
+        foreach( object item in ItemsSource )
+        {
+          var selectorItem = ItemContainerGenerator.ContainerFromItem( item ) as SelectorItem;
+          if( selectorItem != null )
+          {
+            if( selectorItem.IsSelected )
+              selectorItem.IsSelected = false;
+          }
         }
+      }
+
+      _ignoreSetSelectedValue = false;
+    }
 
-        protected object ResolveItemByValue(string value)
+    protected object ResolveItemByValue( string value )
+    {
+      if( !String.IsNullOrEmpty( ValueMemberPath ) )
+      {
+        if( ItemsSource != null )
         {
-            if (!String.IsNullOrEmpty(ValueMemberPath))
+          foreach( object item in ItemsSource )
+          {
+            var property = item.GetType().GetProperty( ValueMemberPath );
+            if( property != null )
             {
-                if (ItemsSource != null)
-                {
-                    foreach (object item in ItemsSource)
-                    {
-                        var property = item.GetType().GetProperty(ValueMemberPath);
-                        if (property != null)
-                        {
-                            var propertyValue = property.GetValue(item, null);
-                            if (value.Equals(propertyValue.ToString(), StringComparison.InvariantCultureIgnoreCase))
-                                return item;
-                        }
-                    }
-                }
+              var propertyValue = property.GetValue( item, null );
+              if( value.Equals( propertyValue.ToString(), StringComparison.InvariantCultureIgnoreCase ) )
+                return item;
             }
-
-            return value;
+          }
         }
+      }
 
-        #endregion //Methods
+      return value;
     }
 
-    public delegate void SelectedItemChangedEventHandler(object sender, SelectedItemChangedEventArgs e);
-    public class SelectedItemChangedEventArgs : RoutedEventArgs
+    #endregion //Methods
+  }
+
+  public delegate void SelectedItemChangedEventHandler( object sender, SelectedItemChangedEventArgs e );
+  public class SelectedItemChangedEventArgs : RoutedEventArgs
+  {
+    public bool IsSelected
+    {
+      get;
+      private set;
+    }
+    public object Item
     {
-        public bool IsSelected { get; private set; }
-        public object Item { get; private set; }
+      get;
+      private set;
+    }
 
-        public SelectedItemChangedEventArgs(RoutedEvent routedEvent, object source, object item, bool isSelected)
-            : base(routedEvent, source)
-        {
-            Item = item;
-            IsSelected = isSelected;
-        }
+    public SelectedItemChangedEventArgs( RoutedEvent routedEvent, object source, object item, bool isSelected )
+      : base( routedEvent, source )
+    {
+      Item = item;
+      IsSelected = isSelected;
     }
+  }
 }
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs
index 9f9151be..16e8de84 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/SelectorItem.cs
@@ -1,79 +1,106 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls.Primitives
 {
-    public class SelectorItem : ContentControl
-    {
-        #region Constructors
-
-        static SelectorItem()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(SelectorItem), new FrameworkPropertyMetadata(typeof(SelectorItem)));
-        }
+  public class SelectorItem : ContentControl
+  {
+    #region Constructors
 
-        public SelectorItem()
-        {
-            AddHandler(Mouse.MouseDownEvent, new MouseButtonEventHandler(OnMouseDown));
-        }
+    static SelectorItem()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( SelectorItem ), new FrameworkPropertyMetadata( typeof( SelectorItem ) ) );
+    }
 
-        #endregion //Constructors
+    public SelectorItem()
+    {
+      AddHandler( Mouse.MouseDownEvent, new MouseButtonEventHandler( OnMouseDown ) );
+    }
 
-        #region Properties
+    #endregion //Constructors
 
-        public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register("IsSelected", typeof(bool), typeof(SelectorItem), new UIPropertyMetadata(false, OnIsSelectedChanged));
-        public bool IsSelected
-        {
-            get { return (bool)GetValue(IsSelectedProperty); }
-            set { SetValue(IsSelectedProperty, value); }
-        }
+    #region Properties
 
-        private static void OnIsSelectedChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            SelectorItem selectorItem = o as SelectorItem;
-            if (selectorItem != null)
-                selectorItem.OnIsSelectedChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
+    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( "IsSelected", typeof( bool ), typeof( SelectorItem ), new UIPropertyMetadata( false, OnIsSelectedChanged ) );
+    public bool IsSelected
+    {
+      get
+      {
+        return ( bool )GetValue( IsSelectedProperty );
+      }
+      set
+      {
+        SetValue( IsSelectedProperty, value );
+      }
+    }
 
-        protected virtual void OnIsSelectedChanged(bool oldValue, bool newValue)
-        {
-            if (newValue)
-                RaiseSelectionChangedEvent(new RoutedEventArgs(Selector.SelectedEvent, this));
-            else
-                RaiseSelectionChangedEvent(new RoutedEventArgs(Selector.UnSelectedEvent, this));
-        }
+    private static void OnIsSelectedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      SelectorItem selectorItem = o as SelectorItem;
+      if( selectorItem != null )
+        selectorItem.OnIsSelectedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
 
-        internal Selector ParentSelector
-        {
-            get { return ItemsControl.ItemsControlFromItemContainer(this) as Selector; }
-        }
+    protected virtual void OnIsSelectedChanged( bool oldValue, bool newValue )
+    {
+      if( newValue )
+        RaiseSelectionChangedEvent( new RoutedEventArgs( Selector.SelectedEvent, this ) );
+      else
+        RaiseSelectionChangedEvent( new RoutedEventArgs( Selector.UnSelectedEvent, this ) );
+    }
 
-        #endregion //Properties
+    internal Selector ParentSelector
+    {
+      get
+      {
+        return ItemsControl.ItemsControlFromItemContainer( this ) as Selector;
+      }
+    }
 
-        #region Events
+    #endregion //Properties
 
-        public static readonly RoutedEvent SelectedEvent = Selector.SelectedEvent.AddOwner(typeof(SelectorItem));
-        public static readonly RoutedEvent UnselectedEvent = Selector.UnSelectedEvent.AddOwner(typeof(SelectorItem));
+    #region Events
 
-        #endregion
+    public static readonly RoutedEvent SelectedEvent = Selector.SelectedEvent.AddOwner( typeof( SelectorItem ) );
+    public static readonly RoutedEvent UnselectedEvent = Selector.UnSelectedEvent.AddOwner( typeof( SelectorItem ) );
 
-        #region Event Hanlders
+    #endregion
 
-        void OnMouseDown(object sender, MouseButtonEventArgs e)
-        {
-            IsSelected = !IsSelected;
-        }
+    #region Event Hanlders
 
-        #endregion //Event Hanlders
+    void OnMouseDown( object sender, MouseButtonEventArgs e )
+    {
+      IsSelected = !IsSelected;
+    }
 
-        #region Methods
+    #endregion //Event Hanlders
 
-        private void RaiseSelectionChangedEvent(RoutedEventArgs e)
-        {
-            base.RaiseEvent(e);
-        }
+    #region Methods
 
-        #endregion //Methods
+    private void RaiseSelectionChangedEvent( RoutedEventArgs e )
+    {
+      base.RaiseEvent( e );
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs
index a0b46dd6..b4029ba6 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Primitives/UpDownBase.cs
@@ -1,322 +1,379 @@
-using System;
-using System.Windows.Controls;
-using Microsoft.Windows.Controls.Primitives;
-using System.Windows.Input;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Data;
+using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls.Primitives
 {
-    public abstract class UpDownBase<T> : InputBase
-    {
-        #region Members
+  public abstract class UpDownBase<T> : InputBase
+  {
+    #region Members
 
-        /// <summary>
-        /// Name constant for Text template part.
-        /// </summary>
-        internal const string ElementTextName = "TextBox";
+    /// <summary>
+    /// Name constant for Text template part.
+    /// </summary>
+    internal const string ElementTextName = "TextBox";
 
-        /// <summary>
-        /// Name constant for Spinner template part.
-        /// </summary>
-        internal const string ElementSpinnerName = "Spinner";
+    /// <summary>
+    /// Name constant for Spinner template part.
+    /// </summary>
+    internal const string ElementSpinnerName = "Spinner";
 
-        /// <summary>
-        /// Flags if the Text and Value properties are in the process of being sync'd
-        /// </summary>
-        private bool _isSyncingTextAndValueProperties;
+    /// <summary>
+    /// Flags if the Text and Value properties are in the process of being sync'd
+    /// </summary>
+    private bool _isSyncingTextAndValueProperties;
 
-        #endregion //Members
+    #endregion //Members
 
-        #region Properties
+    #region Properties
 
-        protected Spinner Spinner { get; private set; }
-        protected TextBox TextBox { get; private set; }
-
-        #region AllowSpin
-
-        public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register("AllowSpin", typeof(bool), typeof(UpDownBase<T>), new UIPropertyMetadata(true));
-        public bool AllowSpin
-        {
-            get { return (bool)GetValue(AllowSpinProperty); }
-            set { SetValue(AllowSpinProperty, value); }
-        }
+    protected Spinner Spinner
+    {
+      get;
+      private set;
+    }
+    protected TextBox TextBox
+    {
+      get;
+      private set;
+    }
 
-        #endregion //AllowSpin
+    #region AllowSpin
 
-        #region MouseWheelActiveOnFocus
+    public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register( "AllowSpin", typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( true ) );
+    public bool AllowSpin
+    {
+      get
+      {
+        return ( bool )GetValue( AllowSpinProperty );
+      }
+      set
+      {
+        SetValue( AllowSpinProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty MouseWheelActiveOnFocusProperty = DependencyProperty.Register("MouseWheelActiveOnFocus", typeof(bool), typeof(UpDownBase<T>), new UIPropertyMetadata(true));
-        public bool MouseWheelActiveOnFocus
-        {
-            get { return (bool)GetValue(MouseWheelActiveOnFocusProperty); }
-            set { SetValue(MouseWheelActiveOnFocusProperty, value); }
-        }
+    #endregion //AllowSpin
 
-        #endregion //MouseWheelActiveOnFocus
+    #region MouseWheelActiveOnFocus
 
-        #region ShowButtonSpinner
+    public static readonly DependencyProperty MouseWheelActiveOnFocusProperty = DependencyProperty.Register( "MouseWheelActiveOnFocus", typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( true ) );
+    public bool MouseWheelActiveOnFocus
+    {
+      get
+      {
+        return ( bool )GetValue( MouseWheelActiveOnFocusProperty );
+      }
+      set
+      {
+        SetValue( MouseWheelActiveOnFocusProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register("ShowButtonSpinner", typeof(bool), typeof(UpDownBase<T>), new UIPropertyMetadata(true));
-        public bool ShowButtonSpinner
-        {
-            get { return (bool)GetValue(ShowButtonSpinnerProperty); }
-            set { SetValue(ShowButtonSpinnerProperty, value); }
-        }
+    #endregion //MouseWheelActiveOnFocus
 
-        #endregion //ShowButtonSpinner
+    #region ShowButtonSpinner
 
-        #region Value
+    public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register( "ShowButtonSpinner", typeof( bool ), typeof( UpDownBase<T> ), new UIPropertyMetadata( true ) );
+    public bool ShowButtonSpinner
+    {
+      get
+      {
+        return ( bool )GetValue( ShowButtonSpinnerProperty );
+      }
+      set
+      {
+        SetValue( ShowButtonSpinnerProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register("Value", typeof(T), typeof(UpDownBase<T>), new FrameworkPropertyMetadata(default(T), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged));
-        public T Value
-        {
-            get { return (T)GetValue(ValueProperty); }
-            set { SetValue(ValueProperty, value); }
-        }
+    #endregion //ShowButtonSpinner
 
-        private static void OnValueChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            UpDownBase<T> upDownBase = o as UpDownBase<T>;
-            if (upDownBase != null)
-                upDownBase.OnValueChanged((T)e.OldValue, (T)e.NewValue);
-        }
+    #region Value
 
-        protected virtual void OnValueChanged(T oldValue, T newValue)
-        {
-            ValidateValue(newValue);
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( T ), typeof( UpDownBase<T> ), new FrameworkPropertyMetadata( default( T ), FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
+    public T Value
+    {
+      get
+      {
+        return ( T )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
 
-            SyncTextAndValueProperties(ValueProperty, string.Empty);
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      UpDownBase<T> upDownBase = o as UpDownBase<T>;
+      if( upDownBase != null )
+        upDownBase.OnValueChanged( ( T )e.OldValue, ( T )e.NewValue );
+    }
 
-            SetValidSpinDirection();
+    protected virtual void OnValueChanged( T oldValue, T newValue )
+    {
+      ValidateValue( newValue );
 
-            RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>(oldValue, newValue);
-            args.RoutedEvent = ValueChangedEvent;
-            RaiseEvent(args);
-        }
+      SyncTextAndValueProperties( ValueProperty, string.Empty );
 
-        #endregion //Value
+      SetValidSpinDirection();
 
-        #endregion //Properties
+      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
+      args.RoutedEvent = ValueChangedEvent;
+      RaiseEvent( args );
+    }
 
-        #region Constructors
+    #endregion //Value
 
-        internal UpDownBase() { }
+    #endregion //Properties
 
-        #endregion //Constructors
+    #region Constructors
 
-        #region Base Class Overrides
+    internal UpDownBase()
+    {
+    }
 
-        protected override void OnAccessKey(AccessKeyEventArgs e)
-        {
-            if (TextBox != null)
-                TextBox.Focus();
+    #endregion //Constructors
 
-            base.OnAccessKey(e);
-        }
+    #region Base Class Overrides
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+    protected override void OnAccessKey( AccessKeyEventArgs e )
+    {
+      if( TextBox != null )
+        TextBox.Focus();
 
-            TextBox = GetTemplateChild(ElementTextName) as TextBox;
+      base.OnAccessKey( e );
+    }
 
-            if (Spinner != null)
-                Spinner.Spin -= OnSpinnerSpin;
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-            Spinner = GetTemplateChild(ElementSpinnerName) as Spinner;
+      TextBox = GetTemplateChild( ElementTextName ) as TextBox;
 
-            if (Spinner != null)
-                Spinner.Spin += OnSpinnerSpin;
+      if( Spinner != null )
+        Spinner.Spin -= OnSpinnerSpin;
 
-            SetValidSpinDirection();
-        }
+      Spinner = GetTemplateChild( ElementSpinnerName ) as Spinner;
 
-        protected override void OnGotFocus(RoutedEventArgs e)
-        {
-            if (TextBox != null)
-                TextBox.Focus();
-        }
+      if( Spinner != null )
+        Spinner.Spin += OnSpinnerSpin;
 
-        protected override void OnPreviewKeyDown(KeyEventArgs e)
-        {
-            switch (e.Key)
-            {
-                case Key.Up:
-                    {
-                        if (AllowSpin && !IsReadOnly)
-                            DoIncrement();
-                        e.Handled = true;
-                        break;
-                    }
-                case Key.Down:
-                    {
-                        if (AllowSpin && !IsReadOnly)
-                            DoDecrement();
-                        e.Handled = true;
-                        break;
-                    }
-                case Key.Enter:
-                    {
-                        if (!IsReadOnly)
-                        {
-                            var binding = BindingOperations.GetBindingExpression(TextBox, System.Windows.Controls.TextBox.TextProperty);
-                            binding.UpdateSource();
-                        }
-                        break;
-                    }
-            }
-        }
+      SetValidSpinDirection();
+    }
 
-        protected override void OnMouseWheel(MouseWheelEventArgs e)
-        {
-            base.OnMouseWheel(e);
+    protected override void OnGotFocus( RoutedEventArgs e )
+    {
+      if( TextBox != null )
+        TextBox.Focus();
+    }
 
-            if (!e.Handled && AllowSpin && !IsReadOnly && ((TextBox.IsFocused && MouseWheelActiveOnFocus) || !MouseWheelActiveOnFocus))
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Up:
+          {
+            if( AllowSpin && !IsReadOnly )
+              DoIncrement();
+            e.Handled = true;
+            break;
+          }
+        case Key.Down:
+          {
+            if( AllowSpin && !IsReadOnly )
+              DoDecrement();
+            e.Handled = true;
+            break;
+          }
+        case Key.Enter:
+          {
+            if( !IsReadOnly )
             {
-                if (e.Delta < 0)
-                {
-                    DoDecrement();
-                }
-                else if (0 < e.Delta)
-                {
-                    DoIncrement();
-                }
-
-                e.Handled = true;
+              var binding = BindingOperations.GetBindingExpression( TextBox, System.Windows.Controls.TextBox.TextProperty );
+              binding.UpdateSource();
             }
-        }
-
-        protected override void OnTextChanged(string oldValue, string newValue)
-        {
-            SyncTextAndValueProperties(InputBase.TextProperty, newValue);
-        }
-
-        #endregion //Base Class Overrides
+            break;
+          }
+      }
+    }
 
-        #region Event Handlers
+    protected override void OnMouseWheel( MouseWheelEventArgs e )
+    {
+      base.OnMouseWheel( e );
 
-        private void OnSpinnerSpin(object sender, SpinEventArgs e)
+      if( !e.Handled && AllowSpin && !IsReadOnly && ( ( TextBox.IsFocused && MouseWheelActiveOnFocus ) || !MouseWheelActiveOnFocus ) )
+      {
+        if( e.Delta < 0 )
         {
-            if (AllowSpin && !IsReadOnly)
-                OnSpin(e);
+          DoDecrement();
         }
-
-        #endregion //Event Handlers
-
-        #region Events
-
-        //Due to a bug in Visual Studio, you cannot create event handlers for generic T args in XAML, so I have to use object instead.
-        public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble, typeof(RoutedPropertyChangedEventHandler<object>), typeof(UpDownBase<T>));
-        public event RoutedPropertyChangedEventHandler<object> ValueChanged
+        else if( 0 < e.Delta )
         {
-            add { AddHandler(ValueChangedEvent, value); }
-            remove { RemoveHandler(ValueChangedEvent, value); }
+          DoIncrement();
         }
 
-        #endregion //Events
+        e.Handled = true;
+      }
+    }
 
-        #region Methods
+    protected override void OnTextChanged( string oldValue, string newValue )
+    {
+      SyncTextAndValueProperties( InputBase.TextProperty, newValue );
+    }
 
-        protected virtual void OnSpin(SpinEventArgs e)
-        {
-            if (e == null)
-                throw new ArgumentNullException("e");
+    #endregion //Base Class Overrides
 
-            if (e.Direction == SpinDirection.Increase)
-                DoIncrement();
-            else
-                DoDecrement();
-        }
+    #region Event Handlers
 
-        /// <summary>
-        /// Performs an increment if conditions allow it.
-        /// </summary>
-        private void DoDecrement()
-        {
-            if (Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Decrease) == ValidSpinDirections.Decrease)
-            {
-                OnDecrement();
-            }
-        }
-
-        /// <summary>
-        /// Performs a decrement if conditions allow it.
-        /// </summary>
-        private void DoIncrement()
-        {
-            if (Spinner == null || (Spinner.ValidSpinDirection & ValidSpinDirections.Increase) == ValidSpinDirections.Increase)
-            {
-                OnIncrement();
-            }
-        }
-
-        protected void SyncTextAndValueProperties(DependencyProperty p, string text)
-        {
-            //prevents recursive syncing properties
-            if (_isSyncingTextAndValueProperties)
-                return;
+    private void OnSpinnerSpin( object sender, SpinEventArgs e )
+    {
+      if( AllowSpin && !IsReadOnly )
+        OnSpin( e );
+    }
 
-            _isSyncingTextAndValueProperties = true;
+    #endregion //Event Handlers
 
-            //this only occures when the user typed in the value
-            if (InputBase.TextProperty == p)
-            {
-                Value = ConvertTextToValue(text);
-            }
+    #region Events
 
-            Text = ConvertValueToText();
+    //Due to a bug in Visual Studio, you cannot create event handlers for generic T args in XAML, so I have to use object instead.
+    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( UpDownBase<T> ) );
+    public event RoutedPropertyChangedEventHandler<object> ValueChanged
+    {
+      add
+      {
+        AddHandler( ValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ValueChangedEvent, value );
+      }
+    }
 
-#if VS2008
-            //there is a bug in .NET 3.5 which will not correctly update the textbox text through binding.
-            if (TextBox != null)
-                TextBox.Text = Text;
-#endif
+    #endregion //Events
 
-            _isSyncingTextAndValueProperties = false;
-        }
+    #region Methods
 
-        #region Abstract
+    protected virtual void OnSpin( SpinEventArgs e )
+    {
+      if( e == null )
+        throw new ArgumentNullException( "e" );
 
-        /// <summary>
-        /// Coerces the value.
-        /// </summary>
-        protected abstract T CoerceValue(T value);
+      if( e.Direction == SpinDirection.Increase )
+        DoIncrement();
+      else
+        DoDecrement();
+    }
 
-        /// <summary>
-        /// Converts the formatted text to a value.
-        /// </summary>
-        protected abstract T ConvertTextToValue(string text);
+    /// <summary>
+    /// Performs an increment if conditions allow it.
+    /// </summary>
+    private void DoDecrement()
+    {
+      if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Decrease ) == ValidSpinDirections.Decrease )
+      {
+        OnDecrement();
+      }
+    }
 
-        /// <summary>
-        /// Converts the value to formatted text.
-        /// </summary>
-        /// <returns></returns>
-        protected abstract string ConvertValueToText();
+    /// <summary>
+    /// Performs a decrement if conditions allow it.
+    /// </summary>
+    private void DoIncrement()
+    {
+      if( Spinner == null || ( Spinner.ValidSpinDirection & ValidSpinDirections.Increase ) == ValidSpinDirections.Increase )
+      {
+        OnIncrement();
+      }
+    }
 
-        /// <summary>
-        /// Called by OnSpin when the spin direction is SpinDirection.Increase.
-        /// </summary>
-        protected abstract void OnIncrement();
+    protected void SyncTextAndValueProperties( DependencyProperty p, string text )
+    {
+      //prevents recursive syncing properties
+      if( _isSyncingTextAndValueProperties )
+        return;
 
-        /// <summary>
-        /// Called by OnSpin when the spin direction is SpinDirection.Descrease.
-        /// </summary>
-        protected abstract void OnDecrement();
+      _isSyncingTextAndValueProperties = true;
 
-        /// <summary>
-        /// Sets the valid spin directions.
-        /// </summary>
-        protected abstract void SetValidSpinDirection();
+      //this only occures when the user typed in the value
+      if( InputBase.TextProperty == p )
+      {
+        Value = ConvertTextToValue( text );
+      }
 
-        /// <summary>
-        /// Validates the value and keeps it between the Min and Max values.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        protected abstract void ValidateValue(T value);
+      Text = ConvertValueToText();
 
-        #endregion //Abstract
+#if VS2008
+      //there is a bug in .NET 3.5 which will not correctly update the textbox text through binding.
+      if ( TextBox != null )
+        TextBox.Text = Text;
+#endif
 
-        #endregion //Methods
+      _isSyncingTextAndValueProperties = false;
     }
+
+    #region Abstract
+
+    /// <summary>
+    /// Coerces the value.
+    /// </summary>
+    protected abstract T CoerceValue( T value );
+
+    /// <summary>
+    /// Converts the formatted text to a value.
+    /// </summary>
+    protected abstract T ConvertTextToValue( string text );
+
+    /// <summary>
+    /// Converts the value to formatted text.
+    /// </summary>
+    /// <returns></returns>
+    protected abstract string ConvertValueToText();
+
+    /// <summary>
+    /// Called by OnSpin when the spin direction is SpinDirection.Increase.
+    /// </summary>
+    protected abstract void OnIncrement();
+
+    /// <summary>
+    /// Called by OnSpin when the spin direction is SpinDirection.Descrease.
+    /// </summary>
+    protected abstract void OnDecrement();
+
+    /// <summary>
+    /// Sets the valid spin directions.
+    /// </summary>
+    protected abstract void SetValidSpinDirection();
+
+    /// <summary>
+    /// Validates the value and keeps it between the Min and Max values.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    protected abstract void ValidateValue( T value );
+
+    #endregion //Abstract
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs
index e640923b..54143a34 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/ResourceKeys.cs
@@ -1,48 +1,65 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 
 namespace Microsoft.Windows.Controls.Themes
 {
-    public static class ResourceKeys
-    {
-        #region Brush Keys
+  public static class ResourceKeys
+  {
+    #region Brush Keys
 
-        public static readonly ResourceKey ControlNormalBackgroundKey = new StaticResourceKey(typeof(ResourceKeys), "ControlNormalBackgroundKey");
-        public static readonly ResourceKey ControlDisabledBackgroundKey = new StaticResourceKey(typeof(ResourceKeys), "ControlDisabledBackgroundKey");
-        public static readonly ResourceKey ControlNormalBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ControlNormalBorderKey");
-        public static readonly ResourceKey ControlMouseOverBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ControlMouseOverBorderKey");
-        public static readonly ResourceKey ControlFocusedBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ControlFocusedBorderKey");
+    public static readonly ResourceKey ControlNormalBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlNormalBackgroundKey" );
+    public static readonly ResourceKey ControlDisabledBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlDisabledBackgroundKey" );
+    public static readonly ResourceKey ControlNormalBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlNormalBorderKey" );
+    public static readonly ResourceKey ControlMouseOverBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlMouseOverBorderKey" );
+    public static readonly ResourceKey ControlFocusedBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ControlFocusedBorderKey" );
 
-        public static readonly ResourceKey ButtonNormalOuterBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonNormalOuterBorderKey");
-        public static readonly ResourceKey ButtonNormalInnerBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonNormalInnerBorderKey");
-        public static readonly ResourceKey ButtonNormalBackgroundKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonNormalBackgroundKey");
+    public static readonly ResourceKey ButtonNormalOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonNormalOuterBorderKey" );
+    public static readonly ResourceKey ButtonNormalInnerBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonNormalInnerBorderKey" );
+    public static readonly ResourceKey ButtonNormalBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonNormalBackgroundKey" );
 
-        public static readonly ResourceKey ButtonMouseOverBackgroundKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonMouseOverBackgroundKey");
-        public static readonly ResourceKey ButtonMouseOverOuterBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonMouseOverOuterBorderKey");
-        public static readonly ResourceKey ButtonMouseOverInnerBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonMouseOverInnerBorderKey");
+    public static readonly ResourceKey ButtonMouseOverBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonMouseOverBackgroundKey" );
+    public static readonly ResourceKey ButtonMouseOverOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonMouseOverOuterBorderKey" );
+    public static readonly ResourceKey ButtonMouseOverInnerBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonMouseOverInnerBorderKey" );
 
-        public static readonly ResourceKey ButtonPressedOuterBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonPressedOuterBorderKey");
-        public static readonly ResourceKey ButtonPressedInnerBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonPressedInnerBorderKey");
-        public static readonly ResourceKey ButtonPressedBackgroundKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonPressedBackgroundKey");
+    public static readonly ResourceKey ButtonPressedOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonPressedOuterBorderKey" );
+    public static readonly ResourceKey ButtonPressedInnerBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonPressedInnerBorderKey" );
+    public static readonly ResourceKey ButtonPressedBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonPressedBackgroundKey" );
 
-        public static readonly ResourceKey ButtonFocusedOuterBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonFocusedOuterBorderKey");
-        public static readonly ResourceKey ButtonFocusedInnerBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonFocusedInnerBorderKey");
-        public static readonly ResourceKey ButtonFocusedBackgroundKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonFocusedBackgroundKey");
+    public static readonly ResourceKey ButtonFocusedOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonFocusedOuterBorderKey" );
+    public static readonly ResourceKey ButtonFocusedInnerBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonFocusedInnerBorderKey" );
+    public static readonly ResourceKey ButtonFocusedBackgroundKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonFocusedBackgroundKey" );
 
-        public static readonly ResourceKey ButtonDisabledOuterBorderKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonDisabledOuterBorderKey");
-        public static readonly ResourceKey ButtonInnerBorderDisabledKey = new StaticResourceKey(typeof(ResourceKeys), "ButtonInnerBorderDisabledKey");
+    public static readonly ResourceKey ButtonDisabledOuterBorderKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonDisabledOuterBorderKey" );
+    public static readonly ResourceKey ButtonInnerBorderDisabledKey = new StaticResourceKey( typeof( ResourceKeys ), "ButtonInnerBorderDisabledKey" );
 
-        #endregion //Brush Keys
+    #endregion //Brush Keys
 
-        public static readonly ResourceKey GlyphNormalForegroundKey = new StaticResourceKey(typeof(ResourceKeys), "GlyphNormalForegroundKey");
-        public static readonly ResourceKey GlyphDisabledForegroundKey = new StaticResourceKey(typeof(ResourceKeys), "GlyphDisabledForegroundKey");
+    public static readonly ResourceKey GlyphNormalForegroundKey = new StaticResourceKey( typeof( ResourceKeys ), "GlyphNormalForegroundKey" );
+    public static readonly ResourceKey GlyphDisabledForegroundKey = new StaticResourceKey( typeof( ResourceKeys ), "GlyphDisabledForegroundKey" );
 
 
 
-        public static readonly ResourceKey SpinButtonCornerRadiusKey = new StaticResourceKey(typeof(ResourceKeys), "SpinButtonCornerRadiusKey");
+    public static readonly ResourceKey SpinButtonCornerRadiusKey = new StaticResourceKey( typeof( ResourceKeys ), "SpinButtonCornerRadiusKey" );
 
 
 
-        public static readonly ResourceKey SpinnerButtonStyleKey = new StaticResourceKey(typeof(ResourceKeys), "SpinnerButtonStyleKey");
-    }
+    public static readonly ResourceKey SpinnerButtonStyleKey = new StaticResourceKey( typeof( ResourceKeys ), "SpinnerButtonStyleKey" );
+  }
 }
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs
index 47c5e643..2b8d0376 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Themes/StaticResourceKey.cs
@@ -1,25 +1,58 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System;
 using System.Windows;
 
 namespace Microsoft.Windows.Controls.Themes
 {
-    public sealed class StaticResourceKey : ResourceKey
+  public sealed class StaticResourceKey : ResourceKey
+  {
+    private string _key;
+    public string Key
+    {
+      get
+      {
+        return _key;
+      }
+    }
+
+    private Type _type;
+    public Type Type
+    {
+      get
+      {
+        return _type;
+      }
+    }
+
+    public StaticResourceKey( Type type, string key )
+    {
+      _type = type;
+      _key = key;
+    }
+
+    public override System.Reflection.Assembly Assembly
     {
-        private string _key;
-        public string Key { get { return _key; } }
-
-        private Type _type;
-        public Type Type { get { return _type; } }
-
-        public StaticResourceKey(Type type, string key)
-        {
-            _type = type;
-            _key = key;
-        }
-
-        public override System.Reflection.Assembly Assembly
-        {
-            get { return _type.Assembly; }
-        }
+      get
+      {
+        return _type.Assembly;
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs
index 263ca034..5816562d 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/UIElementAdorner.cs
@@ -1,215 +1,242 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Collections;
-using System.Windows.Media;
-using System.Windows.Documents;
 using System.Windows;
+using System.Windows.Documents;
+using System.Windows.Media;
 
 namespace Microsoft.Windows.Controls.Core
 {
+  /// <summary>
+  /// An adorner that can display one and only one UIElement.  
+  /// That element can be a panel, which contains multiple other elements.
+  /// The element is added to the adorner's visual and logical trees, enabling it to 
+  /// particpate in dependency property value inheritance, amongst other things.
+  /// </summary>
+  internal class UIElementAdorner<TElement> : Adorner where TElement : UIElement
+  {
+    #region Fields
+
+    TElement _child = null;
+    double _offsetLeft = 0;
+    double _offsetTop = 0;
+
+    #endregion // Fields
+
+    #region Constructor
+
     /// <summary>
-    /// An adorner that can display one and only one UIElement.  
-    /// That element can be a panel, which contains multiple other elements.
-    /// The element is added to the adorner's visual and logical trees, enabling it to 
-    /// particpate in dependency property value inheritance, amongst other things.
+    /// Constructor. 
     /// </summary>
-    internal class UIElementAdorner<TElement>
-        : Adorner
-        where TElement : UIElement
+    /// <param name="adornedElement">The element to which the adorner will be bound.</param>
+    public UIElementAdorner( UIElement adornedElement )
+      : base( adornedElement )
     {
-        #region Fields
+    }
 
-        TElement _child = null;
-        double _offsetLeft = 0;
-        double _offsetTop = 0;
+    #endregion // Constructor
 
-        #endregion // Fields
+    #region Public Interface
 
-        #region Constructor
+    #region Child
 
-        /// <summary>
-        /// Constructor. 
-        /// </summary>
-        /// <param name="adornedElement">The element to which the adorner will be bound.</param>
-        public UIElementAdorner(UIElement adornedElement)
-            : base(adornedElement)
+    /// <summary>
+    /// Gets/sets the child element hosted in the adorner.
+    /// </summary>
+    public TElement Child
+    {
+      get
+      {
+        return _child;
+      }
+      set
+      {
+        if( value == _child )
+          return;
+
+        if( _child != null )
         {
+          base.RemoveLogicalChild( _child );
+          base.RemoveVisualChild( _child );
         }
 
-        #endregion // Constructor
-
-        #region Public Interface
-
-        #region Child
+        _child = value;
 
-        /// <summary>
-        /// Gets/sets the child element hosted in the adorner.
-        /// </summary>
-        public TElement Child
+        if( _child != null )
         {
-            get { return _child; }
-            set
-            {
-                if (value == _child)
-                    return;
-
-                if (_child != null)
-                {
-                    base.RemoveLogicalChild(_child);
-                    base.RemoveVisualChild(_child);
-                }
-
-                _child = value;
-
-                if (_child != null)
-                {
-                    base.AddLogicalChild(_child);
-                    base.AddVisualChild(_child);
-                }
-            }
+          base.AddLogicalChild( _child );
+          base.AddVisualChild( _child );
         }
+      }
+    }
 
-        #endregion // Child
+    #endregion // Child
 
-        #region GetDesiredTransform
+    #region GetDesiredTransform
 
-        /// <summary>
-        /// Override.
-        /// </summary>
-        /// <param name="transform"></param>
-        /// <returns></returns>
-        public override GeneralTransform GetDesiredTransform(GeneralTransform transform)
-        {
-            GeneralTransformGroup result = new GeneralTransformGroup();
-            result.Children.Add(base.GetDesiredTransform(transform));
-            result.Children.Add(new TranslateTransform(_offsetLeft, _offsetTop));
-            return result;
-        }
-
-        #endregion // GetDesiredTransform
+    /// <summary>
+    /// Override.
+    /// </summary>
+    /// <param name="transform"></param>
+    /// <returns></returns>
+    public override GeneralTransform GetDesiredTransform( GeneralTransform transform )
+    {
+      GeneralTransformGroup result = new GeneralTransformGroup();
+      result.Children.Add( base.GetDesiredTransform( transform ) );
+      result.Children.Add( new TranslateTransform( _offsetLeft, _offsetTop ) );
+      return result;
+    }
 
-        #region OffsetLeft
+    #endregion // GetDesiredTransform
 
-        /// <summary>
-        /// Gets/sets the horizontal offset of the adorner.
-        /// </summary>
-        public double OffsetLeft
-        {
-            get { return _offsetLeft; }
-            set
-            {
-                _offsetLeft = value;
-                UpdateLocation();
-            }
-        }
+    #region OffsetLeft
 
-        #endregion // OffsetLeft
+    /// <summary>
+    /// Gets/sets the horizontal offset of the adorner.
+    /// </summary>
+    public double OffsetLeft
+    {
+      get
+      {
+        return _offsetLeft;
+      }
+      set
+      {
+        _offsetLeft = value;
+        UpdateLocation();
+      }
+    }
 
-        #region SetOffsets
+    #endregion // OffsetLeft
 
-        /// <summary>
-        /// Updates the location of the adorner in one atomic operation.
-        /// </summary>
-        public void SetOffsets(double left, double top)
-        {
-            _offsetLeft = left;
-            _offsetTop = top;
-            this.UpdateLocation();
-        }
+    #region SetOffsets
 
-        #endregion // SetOffsets
+    /// <summary>
+    /// Updates the location of the adorner in one atomic operation.
+    /// </summary>
+    public void SetOffsets( double left, double top )
+    {
+      _offsetLeft = left;
+      _offsetTop = top;
+      this.UpdateLocation();
+    }
 
-        #region OffsetTop
+    #endregion // SetOffsets
 
-        /// <summary>
-        /// Gets/sets the vertical offset of the adorner.
-        /// </summary>
-        public double OffsetTop
-        {
-            get { return _offsetTop; }
-            set
-            {
-                _offsetTop = value;
-                UpdateLocation();
-            }
-        }
+    #region OffsetTop
 
-        #endregion // OffsetTop
+    /// <summary>
+    /// Gets/sets the vertical offset of the adorner.
+    /// </summary>
+    public double OffsetTop
+    {
+      get
+      {
+        return _offsetTop;
+      }
+      set
+      {
+        _offsetTop = value;
+        UpdateLocation();
+      }
+    }
 
-        #endregion // Public Interface
+    #endregion // OffsetTop
 
-        #region Protected Overrides
+    #endregion // Public Interface
 
-        /// <summary>
-        /// Override.
-        /// </summary>
-        /// <param name="constraint"></param>
-        /// <returns></returns>
-        protected override Size MeasureOverride(Size constraint)
-        {
-            if (_child == null)
-                return base.MeasureOverride(constraint);
+    #region Protected Overrides
 
-            _child.Measure(constraint);
-            return _child.DesiredSize;
-        }
+    /// <summary>
+    /// Override.
+    /// </summary>
+    /// <param name="constraint"></param>
+    /// <returns></returns>
+    protected override Size MeasureOverride( Size constraint )
+    {
+      if( _child == null )
+        return base.MeasureOverride( constraint );
 
-        /// <summary>
-        /// Override.
-        /// </summary>
-        /// <param name="finalSize"></param>
-        /// <returns></returns>
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            if (_child == null)
-                return base.ArrangeOverride(finalSize);
+      _child.Measure( constraint );
+      return _child.DesiredSize;
+    }
 
-            _child.Arrange(new Rect(finalSize));
-            return finalSize;
-        }
+    /// <summary>
+    /// Override.
+    /// </summary>
+    /// <param name="finalSize"></param>
+    /// <returns></returns>
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      if( _child == null )
+        return base.ArrangeOverride( finalSize );
 
-        /// <summary>
-        /// Override.
-        /// </summary>
-        protected override IEnumerator LogicalChildren
-        {
-            get
-            {
-                ArrayList list = new ArrayList();
-                if (_child != null)
-                    list.Add(_child);
-                return list.GetEnumerator();
-            }
-        }
+      _child.Arrange( new Rect( finalSize ) );
+      return finalSize;
+    }
 
-        /// <summary>
-        /// Override.
-        /// </summary>
-        /// <param name="index"></param>
-        /// <returns></returns>
-        protected override Visual GetVisualChild(int index)
-        {
-            return _child;
-        }
+    /// <summary>
+    /// Override.
+    /// </summary>
+    protected override IEnumerator LogicalChildren
+    {
+      get
+      {
+        ArrayList list = new ArrayList();
+        if( _child != null )
+          list.Add( _child );
+        return list.GetEnumerator();
+      }
+    }
 
-        /// <summary>
-        /// Override.
-        /// </summary>
-        protected override int VisualChildrenCount
-        {
-            get { return _child == null ? 0 : 1; }
-        }
+    /// <summary>
+    /// Override.
+    /// </summary>
+    /// <param name="index"></param>
+    /// <returns></returns>
+    protected override Visual GetVisualChild( int index )
+    {
+      return _child;
+    }
 
-        #endregion // Protected Overrides
+    /// <summary>
+    /// Override.
+    /// </summary>
+    protected override int VisualChildrenCount
+    {
+      get
+      {
+        return _child == null ? 0 : 1;
+      }
+    }
 
-        #region Private Helpers
+    #endregion // Protected Overrides
 
-        void UpdateLocation()
-        {
-            AdornerLayer adornerLayer = base.Parent as AdornerLayer;
-            if (adornerLayer != null)
-                adornerLayer.Update(base.AdornedElement);
-        }
+    #region Private Helpers
 
-        #endregion // Private Helpers
+    void UpdateLocation()
+    {
+      AdornerLayer adornerLayer = base.Parent as AdornerLayer;
+      if( adornerLayer != null )
+        adornerLayer.Update( base.AdornedElement );
     }
+
+    #endregion // Private Helpers
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs
index bb1337f1..569bf818 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/CalculatorUtilities.cs
@@ -1,245 +1,280 @@
-using System;
-using System.Windows.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
+using System.Globalization;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Media;
-using System.Globalization;
 
 namespace Microsoft.Windows.Controls.Core.Utilities
 {
-    static class CalculatorUtilities
+  static class CalculatorUtilities
+  {
+    public static Calculator.CalculatorButtonType GetCalculatorButtonTypeFromText( string text )
     {
-        public static Calculator.CalculatorButtonType GetCalculatorButtonTypeFromText(string text)
-        {
-            switch (text)
-            {
-                case "0": return Calculator.CalculatorButtonType.Zero;
-                case "1": return Calculator.CalculatorButtonType.One;
-                case "2": return Calculator.CalculatorButtonType.Two;
-                case "3": return Calculator.CalculatorButtonType.Three;
-                case "4": return Calculator.CalculatorButtonType.Four;
-                case "5": return Calculator.CalculatorButtonType.Five;
-                case "6": return Calculator.CalculatorButtonType.Six;
-                case "7": return Calculator.CalculatorButtonType.Seven;
-                case "8": return Calculator.CalculatorButtonType.Eight;
-                case "9": return Calculator.CalculatorButtonType.Nine;
-                case "+": return Calculator.CalculatorButtonType.Add;
-                case "-": return Calculator.CalculatorButtonType.Subtract;
-                case "*": return Calculator.CalculatorButtonType.Multiply;
-                case "/": return Calculator.CalculatorButtonType.Divide;
-                case "%": return Calculator.CalculatorButtonType.Percent;
-                case "\b": return Calculator.CalculatorButtonType.Back;
-                case "\r":
-                case "=": return Calculator.CalculatorButtonType.Equal;
-            }
-
-            //the check for the decimal is not in the switch statement. To help localize we check against the current culture's decimal seperator
-            if (text == CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator)
-                return Calculator.CalculatorButtonType.Decimal;
-
-            //check for the escape key
-            if (text == ((char)27).ToString())
-                return Calculator.CalculatorButtonType.Clear;
-
-            return Calculator.CalculatorButtonType.None;
-        }
+      switch( text )
+      {
+        case "0":
+          return Calculator.CalculatorButtonType.Zero;
+        case "1":
+          return Calculator.CalculatorButtonType.One;
+        case "2":
+          return Calculator.CalculatorButtonType.Two;
+        case "3":
+          return Calculator.CalculatorButtonType.Three;
+        case "4":
+          return Calculator.CalculatorButtonType.Four;
+        case "5":
+          return Calculator.CalculatorButtonType.Five;
+        case "6":
+          return Calculator.CalculatorButtonType.Six;
+        case "7":
+          return Calculator.CalculatorButtonType.Seven;
+        case "8":
+          return Calculator.CalculatorButtonType.Eight;
+        case "9":
+          return Calculator.CalculatorButtonType.Nine;
+        case "+":
+          return Calculator.CalculatorButtonType.Add;
+        case "-":
+          return Calculator.CalculatorButtonType.Subtract;
+        case "*":
+          return Calculator.CalculatorButtonType.Multiply;
+        case "/":
+          return Calculator.CalculatorButtonType.Divide;
+        case "%":
+          return Calculator.CalculatorButtonType.Percent;
+        case "\b":
+          return Calculator.CalculatorButtonType.Back;
+        case "\r":
+        case "=":
+          return Calculator.CalculatorButtonType.Equal;
+      }
 
-        public static Button FindButtonByCalculatorButtonType(DependencyObject parent, Calculator.CalculatorButtonType type)
-        {
-            for (int i = 0; i < VisualTreeHelper.GetChildrenCount(parent); i++)
-            {
-                var child = VisualTreeHelper.GetChild(parent, i);
-
-                object buttonType = child.GetValue(Button.CommandParameterProperty);
-
-                if (buttonType != null && (Calculator.CalculatorButtonType)buttonType == type)
-                {
-                    return child as Button;
-                }
-                else
-                {
-                    var result = FindButtonByCalculatorButtonType(child, type);
-
-                    if (result != null)
-                        return result;
-                }
-            }
-            return null;
-        }
+      //the check for the decimal is not in the switch statement. To help localize we check against the current culture's decimal seperator
+      if( text == CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator )
+        return Calculator.CalculatorButtonType.Decimal;
 
-        public static string GetCalculatorButtonContent(Calculator.CalculatorButtonType type)
-        {
-            string content = string.Empty;
-            switch (type)
-            {
-                case Calculator.CalculatorButtonType.Add:
-                    content = "+";
-                    break;
-                case Calculator.CalculatorButtonType.Back:
-                    content = "Back";
-                    break;
-                case Calculator.CalculatorButtonType.Cancel:
-                    content = "CE";
-                    break;
-                case Calculator.CalculatorButtonType.Clear:
-                    content = "C";
-                    break;
-                case Calculator.CalculatorButtonType.Decimal:
-                    content = CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator;
-                    break;
-                case Calculator.CalculatorButtonType.Divide:
-                    content = "/";
-                    break;
-                case Calculator.CalculatorButtonType.Eight:
-                    content = "8";
-                    break;
-                case Calculator.CalculatorButtonType.Equal:
-                    content = "=";
-                    break;
-                case Calculator.CalculatorButtonType.Five:
-                    content = "5";
-                    break;
-                case Calculator.CalculatorButtonType.Four:
-                    content = "4";
-                    break;
-                case Calculator.CalculatorButtonType.Fraction:
-                    content = "1/x";
-                    break;
-                case Calculator.CalculatorButtonType.MAdd:
-                    content = "M+";
-                    break;
-                case Calculator.CalculatorButtonType.MC:
-                    content = "MC";
-                    break;
-                case Calculator.CalculatorButtonType.MR:
-                    content = "MR";
-                    break;
-                case Calculator.CalculatorButtonType.MS:
-                    content = "MS";
-                    break;
-                case Calculator.CalculatorButtonType.MSub:
-                    content = "M-";
-                    break;
-                case Calculator.CalculatorButtonType.Multiply:
-                    content = "*";
-                    break;
-                case Calculator.CalculatorButtonType.Nine:
-                    content = "9";
-                    break;
-                case Calculator.CalculatorButtonType.None:
-                    break;
-                case Calculator.CalculatorButtonType.One:
-                    content = "1";
-                    break;
-                case Calculator.CalculatorButtonType.Percent:
-                    content = "%";
-                    break;
-                case Calculator.CalculatorButtonType.Seven:
-                    content = "7";
-                    break;
-                case Calculator.CalculatorButtonType.Negate:
-                    content = "+/-";
-                    break;
-                case Calculator.CalculatorButtonType.Six:
-                    content = "6";
-                    break;
-                case Calculator.CalculatorButtonType.Sqrt:
-                    content = "Sqrt";
-                    break;
-                case Calculator.CalculatorButtonType.Subtract:
-                    content = "-";
-                    break;
-                case Calculator.CalculatorButtonType.Three:
-                    content = "3";
-                    break;
-                case Calculator.CalculatorButtonType.Two:
-                    content = "2";
-                    break;
-                case Calculator.CalculatorButtonType.Zero:
-                    content = "0";
-                    break;
-            }
-            return content;
-        }
+      //check for the escape key
+      if( text == ( ( char )27 ).ToString() )
+        return Calculator.CalculatorButtonType.Clear;
 
-        public static bool IsDigit(Calculator.CalculatorButtonType buttonType)
-        {
-            switch (buttonType)
-            {
-                case Calculator.CalculatorButtonType.Zero:
-                case Calculator.CalculatorButtonType.One:
-                case Calculator.CalculatorButtonType.Two:
-                case Calculator.CalculatorButtonType.Three:
-                case Calculator.CalculatorButtonType.Four:
-                case Calculator.CalculatorButtonType.Five:
-                case Calculator.CalculatorButtonType.Six:
-                case Calculator.CalculatorButtonType.Seven:
-                case Calculator.CalculatorButtonType.Eight:
-                case Calculator.CalculatorButtonType.Nine:
-                case Calculator.CalculatorButtonType.Decimal:
-                    return true;
-                default:
-                    return false;
-            }
-        }
+      return Calculator.CalculatorButtonType.None;
+    }
 
-        public static bool IsMemory(Calculator.CalculatorButtonType buttonType)
-        {
-            switch (buttonType)
-            {
-                case Calculator.CalculatorButtonType.MAdd:
-                case Calculator.CalculatorButtonType.MC:
-                case Calculator.CalculatorButtonType.MR:
-                case Calculator.CalculatorButtonType.MS:
-                case Calculator.CalculatorButtonType.MSub:
-                    return true;
-                default:
-                    return false;
-            }
-        }
+    public static Button FindButtonByCalculatorButtonType( DependencyObject parent, Calculator.CalculatorButtonType type )
+    {
+      for( int i = 0; i < VisualTreeHelper.GetChildrenCount( parent ); i++ )
+      {
+        var child = VisualTreeHelper.GetChild( parent, i );
 
-        public static decimal ParseDecimal(string text)
-        {
-            return Decimal.Parse(text, CultureInfo.CurrentCulture);
-        }
+        object buttonType = child.GetValue( Button.CommandParameterProperty );
 
-        public static decimal Add(decimal firstNumber, decimal secondNumber)
+        if( buttonType != null && ( Calculator.CalculatorButtonType )buttonType == type )
         {
-            return firstNumber + secondNumber;
+          return child as Button;
         }
-
-        public static decimal Subtract(decimal firstNumber, decimal secondNumber)
+        else
         {
-            return firstNumber - secondNumber;
-        }
+          var result = FindButtonByCalculatorButtonType( child, type );
 
-        public static decimal Multiply(decimal firstNumber, decimal secondNumber)
-        {
-            return firstNumber * secondNumber;
+          if( result != null )
+            return result;
         }
+      }
+      return null;
+    }
 
-        public static decimal Divide(decimal firstNumber, decimal secondNumber)
-        {
-            return firstNumber / secondNumber;
-        }
+    public static string GetCalculatorButtonContent( Calculator.CalculatorButtonType type )
+    {
+      string content = string.Empty;
+      switch( type )
+      {
+        case Calculator.CalculatorButtonType.Add:
+          content = "+";
+          break;
+        case Calculator.CalculatorButtonType.Back:
+          content = "Back";
+          break;
+        case Calculator.CalculatorButtonType.Cancel:
+          content = "CE";
+          break;
+        case Calculator.CalculatorButtonType.Clear:
+          content = "C";
+          break;
+        case Calculator.CalculatorButtonType.Decimal:
+          content = CultureInfo.CurrentCulture.NumberFormat.CurrencyDecimalSeparator;
+          break;
+        case Calculator.CalculatorButtonType.Divide:
+          content = "/";
+          break;
+        case Calculator.CalculatorButtonType.Eight:
+          content = "8";
+          break;
+        case Calculator.CalculatorButtonType.Equal:
+          content = "=";
+          break;
+        case Calculator.CalculatorButtonType.Five:
+          content = "5";
+          break;
+        case Calculator.CalculatorButtonType.Four:
+          content = "4";
+          break;
+        case Calculator.CalculatorButtonType.Fraction:
+          content = "1/x";
+          break;
+        case Calculator.CalculatorButtonType.MAdd:
+          content = "M+";
+          break;
+        case Calculator.CalculatorButtonType.MC:
+          content = "MC";
+          break;
+        case Calculator.CalculatorButtonType.MR:
+          content = "MR";
+          break;
+        case Calculator.CalculatorButtonType.MS:
+          content = "MS";
+          break;
+        case Calculator.CalculatorButtonType.MSub:
+          content = "M-";
+          break;
+        case Calculator.CalculatorButtonType.Multiply:
+          content = "*";
+          break;
+        case Calculator.CalculatorButtonType.Nine:
+          content = "9";
+          break;
+        case Calculator.CalculatorButtonType.None:
+          break;
+        case Calculator.CalculatorButtonType.One:
+          content = "1";
+          break;
+        case Calculator.CalculatorButtonType.Percent:
+          content = "%";
+          break;
+        case Calculator.CalculatorButtonType.Seven:
+          content = "7";
+          break;
+        case Calculator.CalculatorButtonType.Negate:
+          content = "+/-";
+          break;
+        case Calculator.CalculatorButtonType.Six:
+          content = "6";
+          break;
+        case Calculator.CalculatorButtonType.Sqrt:
+          content = "Sqrt";
+          break;
+        case Calculator.CalculatorButtonType.Subtract:
+          content = "-";
+          break;
+        case Calculator.CalculatorButtonType.Three:
+          content = "3";
+          break;
+        case Calculator.CalculatorButtonType.Two:
+          content = "2";
+          break;
+        case Calculator.CalculatorButtonType.Zero:
+          content = "0";
+          break;
+      }
+      return content;
+    }
 
-        public static decimal Percent(decimal firstNumber, decimal secondNumber)
-        {
-            return firstNumber * secondNumber / 100M;
-        }
+    public static bool IsDigit( Calculator.CalculatorButtonType buttonType )
+    {
+      switch( buttonType )
+      {
+        case Calculator.CalculatorButtonType.Zero:
+        case Calculator.CalculatorButtonType.One:
+        case Calculator.CalculatorButtonType.Two:
+        case Calculator.CalculatorButtonType.Three:
+        case Calculator.CalculatorButtonType.Four:
+        case Calculator.CalculatorButtonType.Five:
+        case Calculator.CalculatorButtonType.Six:
+        case Calculator.CalculatorButtonType.Seven:
+        case Calculator.CalculatorButtonType.Eight:
+        case Calculator.CalculatorButtonType.Nine:
+        case Calculator.CalculatorButtonType.Decimal:
+          return true;
+        default:
+          return false;
+      }
+    }
 
-        public static decimal SquareRoot(decimal operand)
-        {
-            return Convert.ToDecimal(Math.Sqrt(Convert.ToDouble(operand)));
-        }
+    public static bool IsMemory( Calculator.CalculatorButtonType buttonType )
+    {
+      switch( buttonType )
+      {
+        case Calculator.CalculatorButtonType.MAdd:
+        case Calculator.CalculatorButtonType.MC:
+        case Calculator.CalculatorButtonType.MR:
+        case Calculator.CalculatorButtonType.MS:
+        case Calculator.CalculatorButtonType.MSub:
+          return true;
+        default:
+          return false;
+      }
+    }
 
-        public static decimal Fraction(decimal operand)
-        {
-            return 1 / operand;
-        }
+    public static decimal ParseDecimal( string text )
+    {
+      return Decimal.Parse( text, CultureInfo.CurrentCulture );
+    }
 
-        public static decimal Negate(decimal operand)
-        {
-            return operand * -1M;
-        }
+    public static decimal Add( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber + secondNumber;
+    }
+
+    public static decimal Subtract( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber - secondNumber;
+    }
+
+    public static decimal Multiply( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber * secondNumber;
+    }
+
+    public static decimal Divide( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber / secondNumber;
+    }
+
+    public static decimal Percent( decimal firstNumber, decimal secondNumber )
+    {
+      return firstNumber * secondNumber / 100M;
+    }
+
+    public static decimal SquareRoot( decimal operand )
+    {
+      return Convert.ToDecimal( Math.Sqrt( Convert.ToDouble( operand ) ) );
+    }
+
+    public static decimal Fraction( decimal operand )
+    {
+      return 1 / operand;
+    }
+
+    public static decimal Negate( decimal operand )
+    {
+      return operand * -1M;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs
index cb2d7c18..1c01f08b 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ColorUtilities.cs
@@ -1,177 +1,200 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System;
+using System.Collections.Generic;
 using System.Linq;
-using System.Windows.Media;
 using System.Reflection;
-using System.Collections.Generic;
+using System.Windows.Media;
 using Microsoft.Windows.Controls.Primitives;
 
 namespace Microsoft.Windows.Controls.Core.Utilities
 {
-    static class ColorUtilities
+  static class ColorUtilities
+  {
+    public static readonly Dictionary<string, Color> KnownColors = GetKnownColors();
+
+    public static string GetColorName( this Color color )
     {
-        public static readonly Dictionary<string, Color> KnownColors = GetKnownColors();
+      string colorName = KnownColors.Where( kvp => kvp.Value.Equals( color ) ).Select( kvp => kvp.Key ).FirstOrDefault();
 
-        public static string GetColorName(this Color color)
-        {
-            string colorName = KnownColors.Where(kvp => kvp.Value.Equals(color)).Select(kvp => kvp.Key).FirstOrDefault();
+      if( String.IsNullOrEmpty( colorName ) )
+        colorName = color.ToString();
 
-            if (String.IsNullOrEmpty(colorName))
-                colorName = color.ToString();
+      return colorName;
+    }
 
-            return colorName;
-        }
+    private static Dictionary<string, Color> GetKnownColors()
+    {
+      var colorProperties = typeof( Colors ).GetProperties( BindingFlags.Static | BindingFlags.Public );
+      return colorProperties.ToDictionary( p => p.Name, p => ( Color )p.GetValue( null, null ) );
+    }
 
-        private static Dictionary<string, Color> GetKnownColors()
-        {
-            var colorProperties = typeof(Colors).GetProperties(BindingFlags.Static | BindingFlags.Public);
-            return colorProperties.ToDictionary(p => p.Name, p => (Color)p.GetValue(null, null));
-        }
+    /// <summary>
+    /// Converts an RGB color to an HSV color.
+    /// </summary>
+    /// <param name="r"></param>
+    /// <param name="b"></param>
+    /// <param name="g"></param>
+    /// <returns></returns>
+    public static HsvColor ConvertRgbToHsv( int r, int b, int g )
+    {
+      double delta, min;
+      double h = 0, s, v;
+
+      min = Math.Min( Math.Min( r, g ), b );
+      v = Math.Max( Math.Max( r, g ), b );
+      delta = v - min;
+
+      if( v == 0.0 )
+      {
+        s = 0;
+      }
+      else
+        s = delta / v;
+
+      if( s == 0 )
+        h = 0.0;
+
+      else
+      {
+        if( r == v )
+          h = ( g - b ) / delta;
+        else if( g == v )
+          h = 2 + ( b - r ) / delta;
+        else if( b == v )
+          h = 4 + ( r - g ) / delta;
+
+        h *= 60;
+        if( h < 0.0 )
+          h = h + 360;
+
+      }
+
+      return new HsvColor
+      {
+        H = h,
+        S = s,
+        V = v / 255
+      };
+    }
 
-        /// <summary>
-        /// Converts an RGB color to an HSV color.
-        /// </summary>
-        /// <param name="r"></param>
-        /// <param name="b"></param>
-        /// <param name="g"></param>
-        /// <returns></returns>
-        public static HsvColor ConvertRgbToHsv(int r, int b, int g)
+    /// <summary>
+    ///  Converts an HSV color to an RGB color.
+    /// </summary>
+    /// <param name="h"></param>
+    /// <param name="s"></param>
+    /// <param name="v"></param>
+    /// <returns></returns>
+    public static Color ConvertHsvToRgb( double h, double s, double v )
+    {
+      double r = 0, g = 0, b = 0;
+
+      if( s == 0 )
+      {
+        r = v;
+        g = v;
+        b = v;
+      }
+      else
+      {
+        int i;
+        double f, p, q, t;
+
+        if( h == 360 )
+          h = 0;
+        else
+          h = h / 60;
+
+        i = ( int )Math.Truncate( h );
+        f = h - i;
+
+        p = v * ( 1.0 - s );
+        q = v * ( 1.0 - ( s * f ) );
+        t = v * ( 1.0 - ( s * ( 1.0 - f ) ) );
+
+        switch( i )
         {
-            double delta, min;
-            double h = 0, s, v;
-
-            min = Math.Min(Math.Min(r, g), b);
-            v = Math.Max(Math.Max(r, g), b);
-            delta = v - min;
-
-            if (v == 0.0)
+          case 0:
             {
-                s = 0;
+              r = v;
+              g = t;
+              b = p;
+              break;
             }
-            else
-                s = delta / v;
-
-            if (s == 0)
-                h = 0.0;
-
-            else
+          case 1:
             {
-                if (r == v)
-                    h = (g - b) / delta;
-                else if (g == v)
-                    h = 2 + (b - r) / delta;
-                else if (b == v)
-                    h = 4 + (r - g) / delta;
-
-                h *= 60;
-                if (h < 0.0)
-                    h = h + 360;
-
+              r = q;
+              g = v;
+              b = p;
+              break;
             }
-
-            return new HsvColor { H = h, S = s, V = v / 255 };
-        }
-
-        /// <summary>
-        ///  Converts an HSV color to an RGB color.
-        /// </summary>
-        /// <param name="h"></param>
-        /// <param name="s"></param>
-        /// <param name="v"></param>
-        /// <returns></returns>
-        public static Color ConvertHsvToRgb(double h, double s, double v)
-        {
-            double r = 0, g = 0, b = 0;
-
-            if (s == 0)
+          case 2:
             {
-                r = v;
-                g = v;
-                b = v;
+              r = p;
+              g = v;
+              b = t;
+              break;
             }
-            else
+          case 3:
             {
-                int i;
-                double f, p, q, t;
-
-                if (h == 360)
-                    h = 0;
-                else
-                    h = h / 60;
-
-                i = (int)Math.Truncate(h);
-                f = h - i;
-
-                p = v * (1.0 - s);
-                q = v * (1.0 - (s * f));
-                t = v * (1.0 - (s * (1.0 - f)));
-
-                switch (i)
-                {
-                    case 0:
-                        {
-                            r = v;
-                            g = t;
-                            b = p;
-                            break;
-                        }
-                    case 1:
-                        {
-                            r = q;
-                            g = v;
-                            b = p;
-                            break;
-                        }
-                    case 2:
-                        {
-                            r = p;
-                            g = v;
-                            b = t;
-                            break;
-                        }
-                    case 3:
-                        {
-                            r = p;
-                            g = q;
-                            b = v;
-                            break;
-                        }
-                    case 4:
-                        {
-                            r = t;
-                            g = p;
-                            b = v;
-                            break;
-                        }
-                    default:
-                        {
-                            r = v;
-                            g = p;
-                            b = q;
-                            break;
-                        }
-                }
-
+              r = p;
+              g = q;
+              b = v;
+              break;
+            }
+          case 4:
+            {
+              r = t;
+              g = p;
+              b = v;
+              break;
+            }
+          default:
+            {
+              r = v;
+              g = p;
+              b = q;
+              break;
             }
-
-            return Color.FromArgb(255, (byte)(r * 255), (byte)(g * 255), (byte)(b * 255));
         }
 
-        /// <summary>
-        /// Generates a list of colors with hues ranging from 0 360 and a saturation and value of 1. 
-        /// </summary>
-        /// <returns></returns>
-        public static List<Color> GenerateHsvSpectrum()
-        {
-            List<Color> colorsList = new List<Color>(8);
+      }
 
-            for (int i = 0; i < 29; i++)
-            {
-                colorsList.Add(ColorUtilities.ConvertHsvToRgb(i * 12, 1, 1));
-            }
+      return Color.FromArgb( 255, ( byte )( r * 255 ), ( byte )( g * 255 ), ( byte )( b * 255 ) );
+    }
 
-            colorsList.Add(ColorUtilities.ConvertHsvToRgb(0, 1, 1));
+    /// <summary>
+    /// Generates a list of colors with hues ranging from 0 360 and a saturation and value of 1. 
+    /// </summary>
+    /// <returns></returns>
+    public static List<Color> GenerateHsvSpectrum()
+    {
+      List<Color> colorsList = new List<Color>( 8 );
 
-            return colorsList;
-        }
+      for( int i = 0; i < 29; i++ )
+      {
+        colorsList.Add( ColorUtilities.ConvertHsvToRgb( i * 12, 1, 1 ) );
+      }
+
+      colorsList.Add( ColorUtilities.ConvertHsvToRgb( 0, 1, 1 ) );
+
+      return colorsList;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs
index 59b38f93..4126e0e6 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Core/Utilities/ContextMenuUtilities.cs
@@ -1,35 +1,52 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 
 namespace Microsoft.Windows.Controls.Core.Utilities
 {
-    public class ContextMenuUtilities
+  public class ContextMenuUtilities
+  {
+    public static readonly DependencyProperty OpenOnMouseLeftButtonClickProperty = DependencyProperty.RegisterAttached( "OpenOnMouseLeftButtonClick", typeof( bool ), typeof( ContextMenuUtilities ), new FrameworkPropertyMetadata( false, OpenOnMouseLeftButtonClickChanged ) );
+    public static void SetOpenOnMouseLeftButtonClick( FrameworkElement element, bool value )
     {
-        public static readonly DependencyProperty OpenOnMouseLeftButtonClickProperty = DependencyProperty.RegisterAttached("OpenOnMouseLeftButtonClick", typeof(bool), typeof(ContextMenuUtilities), new FrameworkPropertyMetadata(false, OpenOnMouseLeftButtonClickChanged));
-        public static void SetOpenOnMouseLeftButtonClick(FrameworkElement element, bool value)
-        {
-            element.SetValue(OpenOnMouseLeftButtonClickProperty, value);
-        }
-        public static bool GetOpenOnMouseLeftButtonClick(FrameworkElement element)
-        {
-            return (bool)element.GetValue(OpenOnMouseLeftButtonClickProperty);
-        }
+      element.SetValue( OpenOnMouseLeftButtonClickProperty, value );
+    }
+    public static bool GetOpenOnMouseLeftButtonClick( FrameworkElement element )
+    {
+      return ( bool )element.GetValue( OpenOnMouseLeftButtonClickProperty );
+    }
 
-        public static void OpenOnMouseLeftButtonClickChanged(DependencyObject sender, DependencyPropertyChangedEventArgs e)
+    public static void OpenOnMouseLeftButtonClickChanged( DependencyObject sender, DependencyPropertyChangedEventArgs e )
+    {
+      var control = ( FrameworkElement )sender;
+      if( ( bool )e.NewValue )
+      {
+        control.PreviewMouseLeftButtonDown += ( s, args ) =>
         {
-            var control = (FrameworkElement)sender;
-            if ((bool)e.NewValue)
-            {
-                control.PreviewMouseLeftButtonDown += (s, args) =>
-                {
-                    if (control.ContextMenu != null)
-                    {
-                        control.ContextMenu.PlacementTarget = control;
-                        control.ContextMenu.IsOpen = true;
-                    }
-                };
-            }
-            //TODO: remove handler when set to false
-        }
+          if( control.ContextMenu != null )
+          {
+            control.ContextMenu.PlacementTarget = control;
+            control.ContextMenu.IsOpen = true;
+          }
+        };
+      }
+      //TODO: remove handler when set to false
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs
index 638d50c6..5c861eb7 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Implementation/DateTimePicker.cs
@@ -1,4 +1,22 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -10,175 +28,205 @@ using System.Windows.Controls.Primitives;
 
 namespace Microsoft.Windows.Controls
 {
-    public class DateTimePicker : DateTimeUpDown
+  public class DateTimePicker : DateTimeUpDown
+  {
+    #region Members
+
+    private Calendar _calendar;
+
+    #endregion //Members
+
+    #region Properties
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( DateTimePicker ), new UIPropertyMetadata( false ) );
+    public bool IsOpen
     {
-        #region Members
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
 
-        private Calendar _calendar;
+    #endregion //IsOpen
 
-        #endregion //Members
+    #region TimeFormat
 
-        #region Properties
+    public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register( "TimeFormat", typeof( TimeFormat ), typeof( DateTimePicker ), new UIPropertyMetadata( TimeFormat.ShortTime ) );
+    public TimeFormat TimeFormat
+    {
+      get
+      {
+        return ( TimeFormat )GetValue( TimeFormatProperty );
+      }
+      set
+      {
+        SetValue( TimeFormatProperty, value );
+      }
+    }
 
-        #region IsOpen
+    #endregion //TimeFormat
 
-        public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register("IsOpen", typeof(bool), typeof(DateTimePicker), new UIPropertyMetadata(false));
-        public bool IsOpen
-        {
-            get { return (bool)GetValue(IsOpenProperty); }
-            set { SetValue(IsOpenProperty, value); }
-        }
+    #region TimeFormatString
 
-        #endregion //IsOpen
+    public static readonly DependencyProperty TimeFormatStringProperty = DependencyProperty.Register( "TimeFormatString", typeof( string ), typeof( DateTimePicker ), new UIPropertyMetadata( default( String ) ) );
+    public string TimeFormatString
+    {
+      get
+      {
+        return ( string )GetValue( TimeFormatStringProperty );
+      }
+      set
+      {
+        SetValue( TimeFormatStringProperty, value );
+      }
+    }
 
-        #region TimeFormat
+    #endregion //TimeFormatString
 
-        public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register("TimeFormat", typeof(TimeFormat), typeof(DateTimePicker), new UIPropertyMetadata(TimeFormat.ShortTime));
-        public TimeFormat TimeFormat
-        {
-            get { return (TimeFormat)GetValue(TimeFormatProperty); }
-            set { SetValue(TimeFormatProperty, value); }
-        }
+    #region TimeWatermark
 
-        #endregion //TimeFormat
+    public static readonly DependencyProperty TimeWatermarkProperty = DependencyProperty.Register( "TimeWatermark", typeof( object ), typeof( DateTimePicker ), new UIPropertyMetadata( null ) );
+    public object TimeWatermark
+    {
+      get
+      {
+        return ( object )GetValue( TimeWatermarkProperty );
+      }
+      set
+      {
+        SetValue( TimeWatermarkProperty, value );
+      }
+    }
 
-        #region TimeFormatString
+    #endregion //TimeWatermark
 
-        public static readonly DependencyProperty TimeFormatStringProperty = DependencyProperty.Register("TimeFormatString", typeof(string), typeof(DateTimePicker), new UIPropertyMetadata(default(String)));
-        public string TimeFormatString
-        {
-            get { return (string)GetValue(TimeFormatStringProperty); }
-            set { SetValue(TimeFormatStringProperty, value); }
-        }
+    #region TimeWatermarkTemplate
 
-        #endregion //TimeFormatString
+    public static readonly DependencyProperty TimeWatermarkTemplateProperty = DependencyProperty.Register( "TimeWatermarkTemplate", typeof( DataTemplate ), typeof( DateTimePicker ), new UIPropertyMetadata( null ) );
+    public DataTemplate TimeWatermarkTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( TimeWatermarkTemplateProperty );
+      }
+      set
+      {
+        SetValue( TimeWatermarkTemplateProperty, value );
+      }
+    }
 
-        #region TimeWatermark
+    #endregion //TimeWatermarkTemplate
 
-        public static readonly DependencyProperty TimeWatermarkProperty = DependencyProperty.Register("TimeWatermark", typeof(object), typeof(DateTimePicker), new UIPropertyMetadata(null));
-        public object TimeWatermark
-        {
-            get { return (object)GetValue(TimeWatermarkProperty); }
-            set { SetValue(TimeWatermarkProperty, value); }
-        }
+    #endregion //Properties
 
-        #endregion //TimeWatermark
+    #region Constructors
 
-        #region TimeWatermarkTemplate
+    static DateTimePicker()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DateTimePicker ), new FrameworkPropertyMetadata( typeof( DateTimePicker ) ) );
+    }
 
-        public static readonly DependencyProperty TimeWatermarkTemplateProperty = DependencyProperty.Register("TimeWatermarkTemplate", typeof(DataTemplate), typeof(DateTimePicker), new UIPropertyMetadata(null));
-        public DataTemplate TimeWatermarkTemplate
-        {
-            get { return (DataTemplate)GetValue(TimeWatermarkTemplateProperty); }
-            set { SetValue(TimeWatermarkTemplateProperty, value); }
-        }
+    public DateTimePicker()
+    {
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
 
-        #endregion //TimeWatermarkTemplate
+    #endregion //Constructors
 
-        #endregion //Properties
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-        #region Constructors
+      if( _calendar != null )
+      {
+        _calendar.SelectedDatesChanged -= Calendar_SelectedDatesChanged;
+      }
 
-        static DateTimePicker()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(DateTimePicker), new FrameworkPropertyMetadata(typeof(DateTimePicker)));
-        }
+      _calendar = GetTemplateChild( "Part_Calendar" ) as Calendar;
 
-        public DateTimePicker()
-        {
-            Keyboard.AddKeyDownHandler(this, OnKeyDown);
-            Mouse.AddPreviewMouseDownOutsideCapturedElementHandler(this, OnMouseDownOutsideCapturedElement);
-        }
+      if( _calendar != null )
+      {
+        _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
+        _calendar.SelectedDate = Value ?? null;
+        _calendar.DisplayDate = Value ?? DateTime.Now;
+      }
+    }
 
-        #endregion //Constructors
+    protected override void OnPreviewMouseUp( MouseButtonEventArgs e )
+    {
+      if( Mouse.Captured is CalendarItem )
+        Mouse.Capture( null );
+    }
 
-        #region Base Class Overrides
+    protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
+    {
+      if( _calendar != null && _calendar.SelectedDate != newValue )
+      {
+        _calendar.SelectedDate = newValue;
+        _calendar.DisplayDate = newValue ?? DateTime.Now;
+      }
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+      base.OnValueChanged( oldValue, newValue );
+    }
 
-            if (_calendar != null)
-            {
-                _calendar.SelectedDatesChanged -= Calendar_SelectedDatesChanged;
-            }
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      //if the calendar is open then we don't want to modify the behavior of navigating the calendar control with the Up/Down keys.
+      if( !IsOpen )
+        base.OnPreviewKeyDown( e );
+    }
 
-            _calendar = GetTemplateChild("Part_Calendar") as Calendar;
+    #endregion //Base Class Overrides
 
-            if (_calendar != null)
-            {
-                _calendar.SelectedDatesChanged += Calendar_SelectedDatesChanged;
-                _calendar.SelectedDate = Value ?? null;
-                _calendar.DisplayDate = Value ?? DateTime.Now;
-            }
-        }
+    #region Event Handlers
 
-        protected override void OnPreviewMouseUp(MouseButtonEventArgs e)
-        {
-            if (Mouse.Captured is CalendarItem)
-                Mouse.Capture(null);
-        }
-
-        protected override void OnValueChanged(DateTime? oldValue, DateTime? newValue)
-        {
-            if (_calendar != null && _calendar.SelectedDate != newValue)
-            {
-                _calendar.SelectedDate = newValue;
-                _calendar.DisplayDate = newValue ?? DateTime.Now;
-            }
-
-            base.OnValueChanged(oldValue, newValue);
-        }
-
-        protected override void OnPreviewKeyDown(KeyEventArgs e)
-        {
-            //if the calendar is open then we don't want to modify the behavior of navigating the calendar control with the Up/Down keys.
-            if (!IsOpen)
-                base.OnPreviewKeyDown(e);
-        }
-
-        #endregion //Base Class Overrides
-
-        #region Event Handlers
-
-        private void OnKeyDown(object sender, KeyEventArgs e)
-        {
-            switch (e.Key)
-            {
-                case Key.Escape:
-                case Key.Tab:
-                    {
-                        CloseDateTimePicker();
-                        break;
-                    }
-            }
-        }
-
-        private void OnMouseDownOutsideCapturedElement(object sender, MouseButtonEventArgs e)
-        {
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+        case Key.Tab:
+          {
             CloseDateTimePicker();
-        }
+            break;
+          }
+      }
+    }
 
-        void Calendar_SelectedDatesChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (e.AddedItems.Count > 0)
-            {
-                var newDate = (DateTime?)e.AddedItems[0];
-                Value = newDate;
-            }
-        }
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseDateTimePicker();
+    }
 
-        #endregion //Event Handlers
+    void Calendar_SelectedDatesChanged( object sender, SelectionChangedEventArgs e )
+    {
+      if( e.AddedItems.Count > 0 )
+      {
+        var newDate = ( DateTime? )e.AddedItems[ 0 ];
+        Value = newDate;
+      }
+    }
 
-        #region Methods
+    #endregion //Event Handlers
 
-        private void CloseDateTimePicker()
-        {
-            if (IsOpen)
-                IsOpen = false;
-            ReleaseMouseCapture();
-        }
+    #region Methods
 
-        #endregion //Methods
+    private void CloseDateTimePicker()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
index 9f22cdab..1dcbbec9 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
@@ -1,132 +1,158 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
-    </DataTemplate>
-    
-    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <Style x:Key="DateTimePickerToggleButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Grid SnapsToDevicePixels="True">
-                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                             CornerRadius="0,2.75,2.75,0"
-                                             RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
-                                             RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
-											 RenderMouseOver="{TemplateBinding IsMouseOver}"
-											 RenderPressed="{TemplateBinding IsPressed}" >
-
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-
-                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
-                                    <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                </Grid>
-                            </Grid>
-                        </chrome:ButtonChrome>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- =============================================================================== -->
-    <!-- DateTimePicker                                                                  -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:DateTimePicker}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Right" />
-        <Setter Property="TextAlignment" Value="Right" />
-        <Setter Property="TimeWatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
-                    <Border>
-                        <Grid>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
-                                         AllowSpin="{TemplateBinding AllowSpin}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                                    <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0" 
-                                                Background="Transparent"
-                                                FontFamily="{TemplateBinding FontFamily}" 
-                                                FontSize="{TemplateBinding FontSize}" 
-                                                FontStretch="{TemplateBinding FontStretch}"
-                                                FontStyle="{TemplateBinding FontStyle}" 
-                                                FontWeight="{TemplateBinding FontWeight}" 
-                                                Foreground="{TemplateBinding Foreground}" 
-                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                                                MinWidth="20" AcceptsReturn="False" 
-                                                Padding="0"
-                                                TextAlignment="{TemplateBinding TextAlignment}"
-                                                TextWrapping="NoWrap" 
-                                                TabIndex="{TemplateBinding TabIndex}"
-                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Watermark="{TemplateBinding Watermark}"
-                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}"/>
-                                </local:ButtonSpinner>
-                                <ToggleButton x:Name="_calendarToggleButton" Grid.Column="1" Background="White"
-                                              IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                                              Style="{StaticResource DateTimePickerToggleButtonStyle}"
-                                              IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                              IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
-                            </Grid>
-                            <Popup IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}" StaysOpen="False">
-                                <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
-                                    <StackPanel>
-                                        <Calendar x:Name="Part_Calendar" BorderThickness="0" />
-                                        <local:TimePicker x:Name="Part_TimeUpDown"
-                                                          Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
-                                                          Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" 
-                                                          Format="{TemplateBinding TimeFormat}"
-                                                          FormatString="{TemplateBinding TimeFormatString}"
-                                                          Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
-                                                          Watermark="{TemplateBinding TimeWatermark}"
-                                                          WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"/>
-                                    </StackPanel>
-                                </Border>
-                            </Popup>
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="DateTimePickerToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0,2.75,2.75,0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:DateTimePicker}}"
+											      RenderMouseOver="{TemplateBinding IsMouseOver}"
+											      RenderPressed="{TemplateBinding IsPressed}">
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
                         </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                     </Grid>
+                  </chrome:ButtonChrome>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- DateTimePicker                                                                  -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DateTimePicker}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="TimeWatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
+               <Border>
+                  <Grid>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <local:ButtonSpinner x:Name="Spinner"
+                                             IsTabStop="False"
+                                             Background="{TemplateBinding Background}"
+                                             BorderThickness="{TemplateBinding BorderThickness}"
+                                             AllowSpin="{TemplateBinding AllowSpin}"
+                                             ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                           <local:WatermarkTextBox x:Name="TextBox"
+                                                   BorderThickness="0" 
+                                                   Background="Transparent"
+                                                   FontFamily="{TemplateBinding FontFamily}" 
+                                                   FontSize="{TemplateBinding FontSize}" 
+                                                   FontStretch="{TemplateBinding FontStretch}"
+                                                   FontStyle="{TemplateBinding FontStyle}" 
+                                                   FontWeight="{TemplateBinding FontWeight}" 
+                                                   Foreground="{TemplateBinding Foreground}" 
+                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                   IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   MinWidth="20"
+                                                   AcceptsReturn="False"
+                                                   Padding="0"
+                                                   TextAlignment="{TemplateBinding TextAlignment}"
+                                                   TextWrapping="NoWrap" 
+                                                   TabIndex="{TemplateBinding TabIndex}"
+                                                   Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   Watermark="{TemplateBinding Watermark}"
+                                                   WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                        </local:ButtonSpinner>
+                        <ToggleButton x:Name="_calendarToggleButton"
+                                      Grid.Column="1"
+                                      Background="White"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource DateTimePickerToggleButtonStyle}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                      IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                     </Grid>
+                     <Popup IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}" StaysOpen="False">
+                        <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                           <StackPanel>
+                              <Calendar x:Name="Part_Calendar" BorderThickness="0" />
+                              <local:TimePicker x:Name="Part_TimeUpDown"
+                                                Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                                Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" 
+                                                Format="{TemplateBinding TimeFormat}"
+                                                FormatString="{TemplateBinding TimeFormatString}"
+                                                Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                                Watermark="{TemplateBinding TimeWatermark}"
+                                                WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}" />
+                           </StackPanel>
+                        </Border>
+                     </Popup>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs
index f6c54305..e5882886 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeFormat.cs
@@ -1,19 +1,36 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls
 {
-    public enum DateTimeFormat
-    {
-        Custom,
-        FullDateTime,
-        LongDate,
-        LongTime,
-        MonthDay,
-        RFC1123,
-        ShortDate,
-        ShortTime,
-        SortableDateTime,
-        UniversalSortableDateTime,
-        YearMonth
-    }
+  public enum DateTimeFormat
+  {
+    Custom,
+    FullDateTime,
+    LongDate,
+    LongTime,
+    MonthDay,
+    RFC1123,
+    ShortDate,
+    ShortTime,
+    SortableDateTime,
+    UniversalSortableDateTime,
+    YearMonth
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs
index 8f4f7765..5f9c37fe 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeInfo.cs
@@ -1,14 +1,55 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls
 {
-    internal class DateTimeInfo
+  internal class DateTimeInfo
+  {
+    public string Content
+    {
+      get;
+      set;
+    }
+    public string Format
+    {
+      get;
+      set;
+    }
+    public bool IsReadOnly
+    {
+      get;
+      set;
+    }
+    public int Length
+    {
+      get;
+      set;
+    }
+    public int StartPosition
+    {
+      get;
+      set;
+    }
+    public DateTimePart Type
     {
-        public string Content { get; set; }
-        public string Format { get; set; }
-        public bool IsReadOnly { get; set; }
-        public int Length { get; set; }
-        public int StartPosition { get; set; }
-        public DateTimePart Type { get; set; }
+      get;
+      set;
     }
+  }
 }
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs
index d27dc3c1..2d287405 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeParser.cs
@@ -1,121 +1,139 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 
 namespace Microsoft.Windows.Controls
 {
-    internal class DateTimeParser
+  internal class DateTimeParser
+  {
+    public static bool TryParse( string value, string format, DateTime currentDate, CultureInfo cultureInfo, out DateTime result )
     {
-        public static bool TryParse(string value, string format, DateTime currentDate, CultureInfo cultureInfo, out DateTime result)
-        {
-            bool success = false;
-            result = currentDate;
+      bool success = false;
+      result = currentDate;
 
-            if (string.IsNullOrEmpty(value) || string.IsNullOrEmpty(format))
-                return false;
+      if( string.IsNullOrEmpty( value ) || string.IsNullOrEmpty( format ) )
+        return false;
 
-            var dateTimeString = ResolveDateTimeString(value, format, currentDate, cultureInfo).Trim();
+      var dateTimeString = ResolveDateTimeString( value, format, currentDate, cultureInfo ).Trim();
 
-            if (!String.IsNullOrEmpty(dateTimeString))
-                success = DateTime.TryParse(dateTimeString, cultureInfo.DateTimeFormat, DateTimeStyles.None, out result);
+      if( !String.IsNullOrEmpty( dateTimeString ) )
+        success = DateTime.TryParse( dateTimeString, cultureInfo.DateTimeFormat, DateTimeStyles.None, out result );
 
-            if (!success)
-                result = currentDate;
+      if( !success )
+        result = currentDate;
 
-            return success;
-        }
+      return success;
+    }
+
+    private static string ResolveDateTimeString( string dateTime, string format, DateTime currentDate, CultureInfo cultureInfo )
+    {
+      Dictionary<string, string> dateParts = GetDateParts( currentDate, cultureInfo );
+      string[] timeParts = new string[ 3 ] { currentDate.Hour.ToString(), currentDate.Minute.ToString(), currentDate.Second.ToString() };
+      string designator = "";
+      string[] dateTimeSeparators = new string[] { ",", " ", "-", ".", "/", cultureInfo.DateTimeFormat.DateSeparator, cultureInfo.DateTimeFormat.TimeSeparator };
+
+      ResolveSortableDateTimeString( ref dateTime, ref format, cultureInfo );
 
-        private static string ResolveDateTimeString(string dateTime, string format, DateTime currentDate, CultureInfo cultureInfo)
+      var dateTimeParts = dateTime.Split( dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries ).ToList();
+      var formats = format.Split( dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries ).ToList();
+
+      //something went wrong
+      if( dateTimeParts.Count != formats.Count )
+        return string.Empty;
+
+      for( int i = 0; i < formats.Count; i++ )
+      {
+        var f = formats[ i ];
+        if( !f.Contains( "ddd" ) && !f.Contains( "GMT" ) )
         {
-            Dictionary<string, string> dateParts = GetDateParts(currentDate, cultureInfo);
-            string[] timeParts = new string[3] { currentDate.Hour.ToString(), currentDate.Minute.ToString(), currentDate.Second.ToString() };
-            string designator = "";
-            string[] dateTimeSeparators = new string[] { ",", " ", "-", ".", "/", cultureInfo.DateTimeFormat.DateSeparator, cultureInfo.DateTimeFormat.TimeSeparator };
-
-            ResolveSortableDateTimeString(ref dateTime, ref format, cultureInfo);
-
-            var dateTimeParts = dateTime.Split(dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries).ToList();
-            var formats = format.Split(dateTimeSeparators, StringSplitOptions.RemoveEmptyEntries).ToList();
-
-            //something went wrong
-            if (dateTimeParts.Count != formats.Count)
-                return string.Empty;
-
-            for (int i = 0; i < formats.Count; i++)
-            {
-                var f = formats[i];
-                if (!f.Contains("ddd") && !f.Contains("GMT"))
-                {
-                    if (f.Contains("M"))
-                        dateParts["Month"] = dateTimeParts[i];
-                    else if (f.Contains("d"))
-                        dateParts["Day"] = dateTimeParts[i];
-                    else if (f.Contains("y"))
-                    {
-                        dateParts["Year"] = dateTimeParts[i];
-
-                        if (dateParts["Year"].Length == 2)
-                            dateParts["Year"] = string.Format("{0}{1}", currentDate.Year / 100, dateParts["Year"]);
-                    }
-                    else if (f.Contains("h") || f.Contains("H"))
-                        timeParts[0] = dateTimeParts[i];
-                    else if (f.Contains("m"))
-                        timeParts[1] = dateTimeParts[i];
-                    else if (f.Contains("s"))
-                        timeParts[2] = dateTimeParts[i];
-                    else if (f.Contains("t"))
-                        designator = dateTimeParts[i];
-                }
-            }
-
-            var date = string.Join(cultureInfo.DateTimeFormat.DateSeparator, dateParts.Select(x => x.Value).ToArray());
-            var time = string.Join(cultureInfo.DateTimeFormat.TimeSeparator, timeParts);
-
-            return String.Format("{0} {1} {2}", date, time, designator);
+          if( f.Contains( "M" ) )
+            dateParts[ "Month" ] = dateTimeParts[ i ];
+          else if( f.Contains( "d" ) )
+            dateParts[ "Day" ] = dateTimeParts[ i ];
+          else if( f.Contains( "y" ) )
+          {
+            dateParts[ "Year" ] = dateTimeParts[ i ];
+
+            if( dateParts[ "Year" ].Length == 2 )
+              dateParts[ "Year" ] = string.Format( "{0}{1}", currentDate.Year / 100, dateParts[ "Year" ] );
+          }
+          else if( f.Contains( "h" ) || f.Contains( "H" ) )
+            timeParts[ 0 ] = dateTimeParts[ i ];
+          else if( f.Contains( "m" ) )
+            timeParts[ 1 ] = dateTimeParts[ i ];
+          else if( f.Contains( "s" ) )
+            timeParts[ 2 ] = dateTimeParts[ i ];
+          else if( f.Contains( "t" ) )
+            designator = dateTimeParts[ i ];
         }
+      }
+
+      var date = string.Join( cultureInfo.DateTimeFormat.DateSeparator, dateParts.Select( x => x.Value ).ToArray() );
+      var time = string.Join( cultureInfo.DateTimeFormat.TimeSeparator, timeParts );
+
+      return String.Format( "{0} {1} {2}", date, time, designator );
+    }
+
+    private static void ResolveSortableDateTimeString( ref string dateTime, ref string format, CultureInfo cultureInfo )
+    {
+      if( format == cultureInfo.DateTimeFormat.SortableDateTimePattern )
+      {
+        format = format.Replace( "'", "" ).Replace( "T", " " );
+        dateTime = dateTime.Replace( "'", "" ).Replace( "T", " " );
+      }
+      else if( format == cultureInfo.DateTimeFormat.UniversalSortableDateTimePattern )
+      {
+        format = format.Replace( "'", "" ).Replace( "Z", "" );
+        dateTime = dateTime.Replace( "'", "" ).Replace( "Z", "" );
+      }
+    }
 
-        private static void ResolveSortableDateTimeString(ref string dateTime, ref string format, CultureInfo cultureInfo)
+    private static Dictionary<string, string> GetDateParts( DateTime currentDate, CultureInfo cultureInfo )
+    {
+      Dictionary<string, string> dateParts = new Dictionary<string, string>();
+      var dateFormatParts = cultureInfo.DateTimeFormat.ShortDatePattern.Split( new string[] { cultureInfo.DateTimeFormat.DateSeparator }, StringSplitOptions.RemoveEmptyEntries ).ToList();
+      dateFormatParts.ForEach( item =>
+      {
+        string key = string.Empty;
+        string value = string.Empty;
+
+        if( item.Contains( "M" ) )
         {
-            if (format == cultureInfo.DateTimeFormat.SortableDateTimePattern)
-            {
-                format = format.Replace("'", "").Replace("T", " ");
-                dateTime = dateTime.Replace("'", "").Replace("T", " ");
-            }
-            else if (format == cultureInfo.DateTimeFormat.UniversalSortableDateTimePattern)
-            {
-                format = format.Replace("'", "").Replace("Z", "");
-                dateTime = dateTime.Replace("'", "").Replace("Z", "");
-            }
+          key = "Month";
+          value = currentDate.Month.ToString();
         }
-
-        private static Dictionary<string, string> GetDateParts(DateTime currentDate, CultureInfo cultureInfo)
+        else if( item.Contains( "d" ) )
+        {
+          key = "Day";
+          value = currentDate.Day.ToString();
+        }
+        else if( item.Contains( "y" ) )
         {
-            Dictionary<string, string> dateParts = new Dictionary<string, string>();
-            var dateFormatParts = cultureInfo.DateTimeFormat.ShortDatePattern.Split(new string[] { cultureInfo.DateTimeFormat.DateSeparator }, StringSplitOptions.RemoveEmptyEntries).ToList();
-            dateFormatParts.ForEach(item =>
-            {
-                string key = string.Empty;
-                string value = string.Empty;
-
-                if (item.Contains("M"))
-                {
-                    key = "Month";
-                    value = currentDate.Month.ToString();
-                }
-                else if (item.Contains("d"))
-                {
-                    key = "Day";
-                    value = currentDate.Day.ToString();
-                }
-                else if (item.Contains("y"))
-                {
-                    key = "Year";
-                    value = currentDate.Year.ToString();
-                }
-                dateParts.Add(key, value);
-            });
-            return dateParts;
+          key = "Year";
+          value = currentDate.Year.ToString();
         }
+        dateParts.Add( key, value );
+      } );
+      return dateParts;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs
index d4ec352c..fd725bd9 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimePart.cs
@@ -1,22 +1,39 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls
 {
-    public enum DateTimePart
-    {
-        Day,
-        DayName,
-        AmPmDesignator,
-        Millisecond,
-        Hour12,
-        Hour24,
-        Minute,
-        Month,
-        MonthName,
-        Other,
-        Period,
-        TimeZone,
-        Second,
-        Year
-    }
+  public enum DateTimePart
+  {
+    Day,
+    DayName,
+    AmPmDesignator,
+    Millisecond,
+    Hour12,
+    Hour24,
+    Minute,
+    Month,
+    MonthName,
+    Other,
+    Period,
+    TimeZone,
+    Second,
+    Year
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs
index 200bf050..b3afb05e 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Implementation/DateTimeUpDown.cs
@@ -1,585 +1,705 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Windows;
+using System.Windows.Data;
 using System.Windows.Input;
 using Microsoft.Windows.Controls.Primitives;
-using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls
 {
-    public class DateTimeUpDown : UpDownBase<DateTime?>
-    {
-        #region Members
+  public class DateTimeUpDown : UpDownBase<DateTime?>
+  {
+    #region Members
 
-        private List<DateTimeInfo> _dateTimeInfoList = new List<DateTimeInfo>();
-        private DateTimeInfo _selectedDateTimeInfo;
-        private bool _fireSelectionChangedEvent = true;
-        private bool _processTextChanged = true;
+    private List<DateTimeInfo> _dateTimeInfoList = new List<DateTimeInfo>();
+    private DateTimeInfo _selectedDateTimeInfo;
+    private bool _fireSelectionChangedEvent = true;
+    private bool _processTextChanged = true;
 
-        #endregion //Members
+    #endregion //Members
 
-        #region Properties
+    #region Properties
 
-        #region DefaultValue
+    #region DefaultValue
 
-        public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register("DefaultValue", typeof(DateTime), typeof(DateTimeUpDown), new UIPropertyMetadata(DateTime.Now));
-        public DateTime DefaultValue
-        {
-            get { return (DateTime)GetValue(DefaultValueProperty); }
-            set { SetValue(DefaultValueProperty, value); }
-        }
+    public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register( "DefaultValue", typeof( DateTime ), typeof( DateTimeUpDown ), new UIPropertyMetadata( DateTime.Now ) );
+    public DateTime DefaultValue
+    {
+      get
+      {
+        return ( DateTime )GetValue( DefaultValueProperty );
+      }
+      set
+      {
+        SetValue( DefaultValueProperty, value );
+      }
+    }
 
-        #endregion //DefaultValue
+    #endregion //DefaultValue
 
-        #region Format
+    #region Format
 
-        public static readonly DependencyProperty FormatProperty = DependencyProperty.Register("Format", typeof(DateTimeFormat), typeof(DateTimeUpDown), new UIPropertyMetadata(DateTimeFormat.FullDateTime, OnFormatChanged));
-        public DateTimeFormat Format
-        {
-            get { return (DateTimeFormat)GetValue(FormatProperty); }
-            set { SetValue(FormatProperty, value); }
-        }
+    public static readonly DependencyProperty FormatProperty = DependencyProperty.Register( "Format", typeof( DateTimeFormat ), typeof( DateTimeUpDown ), new UIPropertyMetadata( DateTimeFormat.FullDateTime, OnFormatChanged ) );
+    public DateTimeFormat Format
+    {
+      get
+      {
+        return ( DateTimeFormat )GetValue( FormatProperty );
+      }
+      set
+      {
+        SetValue( FormatProperty, value );
+      }
+    }
 
-        private static void OnFormatChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
-            if (dateTimeUpDown != null)
-                dateTimeUpDown.OnFormatChanged((DateTimeFormat)e.OldValue, (DateTimeFormat)e.NewValue);
-        }
+    private static void OnFormatChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
+      if( dateTimeUpDown != null )
+        dateTimeUpDown.OnFormatChanged( ( DateTimeFormat )e.OldValue, ( DateTimeFormat )e.NewValue );
+    }
 
-        protected virtual void OnFormatChanged(DateTimeFormat oldValue, DateTimeFormat newValue)
-        {
-            InitializeDateTimeInfoListAndParseValue();
-            UpdateTextFormatting();
-        }
+    protected virtual void OnFormatChanged( DateTimeFormat oldValue, DateTimeFormat newValue )
+    {
+      InitializeDateTimeInfoListAndParseValue();
+      UpdateTextFormatting();
+    }
 
-        #endregion //Format
+    #endregion //Format
 
-        #region FormatString
+    #region FormatString
 
-        public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register("FormatString", typeof(string), typeof(DateTimeUpDown), new UIPropertyMetadata(default(String), OnFormatStringChanged));
-        public string FormatString
-        {
-            get { return (string)GetValue(FormatStringProperty); }
-            set { SetValue(FormatStringProperty, value); }
-        }
+    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( DateTimeUpDown ), new UIPropertyMetadata( default( String ), OnFormatStringChanged ) );
+    public string FormatString
+    {
+      get
+      {
+        return ( string )GetValue( FormatStringProperty );
+      }
+      set
+      {
+        SetValue( FormatStringProperty, value );
+      }
+    }
 
-        private static void OnFormatStringChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
-            if (dateTimeUpDown != null)
-                dateTimeUpDown.OnFormatStringChanged((string)e.OldValue, (string)e.NewValue);
-        }
+    private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      DateTimeUpDown dateTimeUpDown = o as DateTimeUpDown;
+      if( dateTimeUpDown != null )
+        dateTimeUpDown.OnFormatStringChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
 
-        protected virtual void OnFormatStringChanged(string oldValue, string newValue)
-        {
-            if (string.IsNullOrEmpty(newValue))
-                throw new ArgumentException("FormatString should be specified.", "newValue");
+    protected virtual void OnFormatStringChanged( string oldValue, string newValue )
+    {
+      if( string.IsNullOrEmpty( newValue ) )
+        throw new ArgumentException( "FormatString should be specified.", "newValue" );
 
-            InitializeDateTimeInfoListAndParseValue();
-            UpdateTextFormatting();
-        }
+      InitializeDateTimeInfoListAndParseValue();
+      UpdateTextFormatting();
+    }
 
-        #endregion //FormatString
+    #endregion //FormatString
 
-        #region Maximum
+    #region Maximum
 
 
 
-        #endregion //Maximum
+    #endregion //Maximum
 
-        #region Minimum
+    #region Minimum
 
 
 
-        #endregion //Minimum
+    #endregion //Minimum
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region Constructors
+    #region Constructors
 
-        static DateTimeUpDown()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(DateTimeUpDown), new FrameworkPropertyMetadata(typeof(DateTimeUpDown)));
-        }
+    static DateTimeUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DateTimeUpDown ), new FrameworkPropertyMetadata( typeof( DateTimeUpDown ) ) );
+    }
 
-        public DateTimeUpDown()
-        {
-            InitializeDateTimeInfoList();
-        }
+    public DateTimeUpDown()
+    {
+      InitializeDateTimeInfoList();
+    }
 
-        #endregion //Constructors
+    #endregion //Constructors
 
-        #region Base Class Overrides
+    #region Base Class Overrides
 
-        public override void OnApplyTemplate()
-        {
-            if (TextBox != null)
-                TextBox.SelectionChanged -= TextBox_SelectionChanged;
+    public override void OnApplyTemplate()
+    {
+      if( TextBox != null )
+        TextBox.SelectionChanged -= TextBox_SelectionChanged;
 
-            base.OnApplyTemplate();
+      base.OnApplyTemplate();
 
-            if (TextBox != null)
-                TextBox.SelectionChanged += TextBox_SelectionChanged;
-        }
+      if( TextBox != null )
+        TextBox.SelectionChanged += TextBox_SelectionChanged;
+    }
 
-        protected override void OnCultureInfoChanged(CultureInfo oldValue, CultureInfo newValue)
-        {
-            InitializeDateTimeInfoList();
-        }
+    protected override void OnCultureInfoChanged( CultureInfo oldValue, CultureInfo newValue )
+    {
+      InitializeDateTimeInfoList();
+    }
 
-        protected override DateTime? CoerceValue(DateTime? value)
-        {
-            //TODO: implement Minimum and Maximum
-            return value;
-        }
+    protected override DateTime? CoerceValue( DateTime? value )
+    {
+      //TODO: implement Minimum and Maximum
+      return value;
+    }
 
-        protected override void OnIncrement()
-        {
-            if (Value.HasValue)
-                UpdateDateTime(1);
-            else
-                Value = DefaultValue;
-        }
+    protected override void OnIncrement()
+    {
+      if( Value.HasValue )
+        UpdateDateTime( 1 );
+      else
+        Value = DefaultValue;
+    }
 
-        protected override void OnDecrement()
-        {
-            if (Value.HasValue)
-                UpdateDateTime(-1);
-            else
-                Value = DefaultValue;
-        }
+    protected override void OnDecrement()
+    {
+      if( Value.HasValue )
+        UpdateDateTime( -1 );
+      else
+        Value = DefaultValue;
+    }
 
-        protected override void OnPreviewKeyDown(KeyEventArgs e)
-        {
-            switch (e.Key)
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Enter:
+          {
+            if( !IsReadOnly )
             {
-                case Key.Enter:
-                    {
-                        if (!IsReadOnly)
-                        {
-                            _fireSelectionChangedEvent = false;
-                            BindingExpression binding = BindingOperations.GetBindingExpression(TextBox, System.Windows.Controls.TextBox.TextProperty);
-                            binding.UpdateSource();
-                            _fireSelectionChangedEvent = true;
-                            e.Handled = true;
-                        }
-                        return;
-                    }
-                default:
-                    {
-                        _fireSelectionChangedEvent = false;
-                        break;
-                    }
+              _fireSelectionChangedEvent = false;
+              BindingExpression binding = BindingOperations.GetBindingExpression( TextBox, System.Windows.Controls.TextBox.TextProperty );
+              binding.UpdateSource();
+              _fireSelectionChangedEvent = true;
+              e.Handled = true;
             }
+            return;
+          }
+        default:
+          {
+            _fireSelectionChangedEvent = false;
+            break;
+          }
+      }
 
-            base.OnPreviewKeyDown(e);
-        }
+      base.OnPreviewKeyDown( e );
+    }
 
-        protected override void OnTextChanged(string previousValue, string currentValue)
-        {
-            if (!_processTextChanged)
-                return;
+    protected override void OnTextChanged( string previousValue, string currentValue )
+    {
+      if( !_processTextChanged )
+        return;
 
-            //TODO: clean this up and make sure it doesn't fire recursively
-            if (String.IsNullOrEmpty(currentValue))
-            {
-                Value = null;
-                return;
-            }
+      //TODO: clean this up and make sure it doesn't fire recursively
+      if( String.IsNullOrEmpty( currentValue ) )
+      {
+        Value = null;
+        return;
+      }
 
-            DateTime current = Value.HasValue ? Value.Value : DateTime.Parse(DateTime.Now.ToString(), CultureInfo.DateTimeFormat);
-            DateTime result;
-            var success = DateTimeParser.TryParse(currentValue, GetFormatString(Format), current, CultureInfo, out result);
+      DateTime current = Value.HasValue ? Value.Value : DateTime.Parse( DateTime.Now.ToString(), CultureInfo.DateTimeFormat );
+      DateTime result;
+      var success = DateTimeParser.TryParse( currentValue, GetFormatString( Format ), current, CultureInfo, out result );
 
-            SyncTextAndValueProperties(InputBase.TextProperty, result.ToString(CultureInfo));
-        }
+      SyncTextAndValueProperties( InputBase.TextProperty, result.ToString( CultureInfo ) );
+    }
 
-        protected override DateTime? ConvertTextToValue(string text)
-        {
-            if (string.IsNullOrEmpty(text))
-                return null;
+    protected override DateTime? ConvertTextToValue( string text )
+    {
+      if( string.IsNullOrEmpty( text ) )
+        return null;
 
-            return DateTime.Parse(text, CultureInfo);
-        }
+      return DateTime.Parse( text, CultureInfo );
+    }
 
-        protected override string ConvertValueToText()
-        {
-            if (Value == null) return string.Empty;
+    protected override string ConvertValueToText()
+    {
+      if( Value == null )
+        return string.Empty;
 
-            return Value.Value.ToString(GetFormatString(Format), CultureInfo);
-        }
+      return Value.Value.ToString( GetFormatString( Format ), CultureInfo );
+    }
 
-        protected override void SetValidSpinDirection()
-        {
-            //TODO: implement Minimum and Maximum
-        }
+    protected override void SetValidSpinDirection()
+    {
+      //TODO: implement Minimum and Maximum
+    }
 
-        protected override void OnValueChanged(DateTime? oldValue, DateTime? newValue)
-        {
-            //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
-            //but only if it is not null
-            if (newValue != null)
-                ParseValueIntoDateTimeInfo();
+    protected override void OnValueChanged( DateTime? oldValue, DateTime? newValue )
+    {
+      //whenever the value changes we need to parse out the value into out DateTimeInfo segments so we can keep track of the individual pieces
+      //but only if it is not null
+      if( newValue != null )
+        ParseValueIntoDateTimeInfo();
 
-            base.OnValueChanged(oldValue, newValue);
-        }
+      base.OnValueChanged( oldValue, newValue );
+    }
 
-        protected override void ValidateValue(DateTime? value)
-        {
-            //TODO: implement min/max
-        }
+    protected override void ValidateValue( DateTime? value )
+    {
+      //TODO: implement min/max
+    }
 
-        #endregion //Base Class Overrides
+    #endregion //Base Class Overrides
 
-        #region Event Hanlders
+    #region Event Hanlders
 
-        void TextBox_SelectionChanged(object sender, RoutedEventArgs e)
-        {
-            if (_fireSelectionChangedEvent)
-                PerformMouseSelection();
-            else
-                _fireSelectionChangedEvent = true;
-        }
+    void TextBox_SelectionChanged( object sender, RoutedEventArgs e )
+    {
+      if( _fireSelectionChangedEvent )
+        PerformMouseSelection();
+      else
+        _fireSelectionChangedEvent = true;
+    }
 
-        #endregion //Event Hanlders
+    #endregion //Event Hanlders
 
-        #region Methods
+    #region Methods
 
-        private void InitializeDateTimeInfoListAndParseValue()
-        {
-            InitializeDateTimeInfoList();
-            if (Value != null)
-                ParseValueIntoDateTimeInfo();
-        }
+    private void InitializeDateTimeInfoListAndParseValue()
+    {
+      InitializeDateTimeInfoList();
+      if( Value != null )
+        ParseValueIntoDateTimeInfo();
+    }
 
-        private void InitializeDateTimeInfoList()
-        {
-            _dateTimeInfoList.Clear();
+    private void InitializeDateTimeInfoList()
+    {
+      _dateTimeInfoList.Clear();
 
-            string format = GetFormatString(Format);
+      string format = GetFormatString( Format );
 
-            if (format == null)
-                return;
+      if( format == null )
+        return;
 
-            while (format.Length > 0)
+      while( format.Length > 0 )
+      {
+        int elementLength = GetElementLengthByFormat( format );
+        DateTimeInfo info = null;
+
+        switch( format[ 0 ] )
+        {
+          case '"':
+          case '\'':
+            {
+              int closingQuotePosition = format.IndexOf( format[ 0 ], 1 );
+              info = new DateTimeInfo
+              {
+                IsReadOnly = true,
+                Type = DateTimePart.Other,
+                Length = 1,
+                Content = format.Substring( 1, Math.Max( 1, closingQuotePosition - 1 ) )
+              };
+              elementLength = Math.Max( 1, closingQuotePosition + 1 );
+              break;
+            }
+          case 'D':
+          case 'd':
             {
-                int elementLength = GetElementLengthByFormat(format);
-                DateTimeInfo info = null;
+              string d = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                d = "%" + d;
 
-                switch (format[0])
+              if( elementLength > 2 )
+                info = new DateTimeInfo
+                {
+                  IsReadOnly = true,
+                  Type = DateTimePart.DayName,
+                  Format = d
+                };
+              else
+                info = new DateTimeInfo
                 {
-                    case '"':
-                    case '\'':
-                        {
-                            int closingQuotePosition = format.IndexOf(format[0], 1);
-                            info = new DateTimeInfo { IsReadOnly = true, Type = DateTimePart.Other, Length = 1, Content = format.Substring(1, Math.Max(1, closingQuotePosition - 1)) };
-                            elementLength = Math.Max(1, closingQuotePosition + 1);
-                            break;
-                        }
-                    case 'D':
-                    case 'd':
-                        {
-                            string d = format.Substring(0, elementLength);
-                            if (elementLength == 1)
-                                d = "%" + d;
-
-                            if (elementLength > 2)
-                                info = new DateTimeInfo { IsReadOnly = true, Type = DateTimePart.DayName, Format = d };
-                            else
-                                info = new DateTimeInfo { IsReadOnly = false, Type = DateTimePart.Day, Format = d };
-                            break;
-                        }
-                    case 'F':
-                    case 'f':
-                        {
-                            string f = format.Substring(0, elementLength);
-                            if (elementLength == 1)
-                                f = "%" + f;
-
-                            info = new DateTimeInfo { IsReadOnly = false, Type = DateTimePart.Millisecond, Format = f };
-                            break;
-                        }
-                    case 'h':
-                        {
-                            string h = format.Substring(0, elementLength);
-                            if (elementLength == 1)
-                                h = "%" + h;
-
-                            info = new DateTimeInfo { IsReadOnly = false, Type = DateTimePart.Hour12, Format = h };
-                            break;
-                        }
-                    case 'H':
-                        {
-                            string H = format.Substring(0, elementLength);
-                            if (elementLength == 1)
-                                H = "%" + H;
-
-                            info = new DateTimeInfo { IsReadOnly = false, Type = DateTimePart.Hour24, Format = H };
-                            break;
-                        }
-                    case 'M':
-                        {
-                            string M = format.Substring(0, elementLength);
-                            if (elementLength == 1)
-                                M = "%" + M;
-
-                            if (elementLength >= 3)
-                                info = new DateTimeInfo { IsReadOnly = false, Type = DateTimePart.MonthName, Format = M };
-                            else
-                                info = new DateTimeInfo { IsReadOnly = false, Type = DateTimePart.Month, Format = M };
-                            break;
-                        }
-                    case 'S':
-                    case 's':
-                        {
-                            string s = format.Substring(0, elementLength);
-                            if (elementLength == 1)
-                                s = "%" + s;
-
-                            info = new DateTimeInfo { IsReadOnly = false, Type = DateTimePart.Second, Format = s };
-                            break;
-                        }
-                    case 'T':
-                    case 't':
-                        {
-                            string t = format.Substring(0, elementLength);
-                            if (elementLength == 1)
-                                t = "%" + t;
-
-                            info = new DateTimeInfo { IsReadOnly = false, Type = DateTimePart.AmPmDesignator, Format = t };
-                            break;
-                        }
-                    case 'Y':
-                    case 'y':
-                        {
-                            string y = format.Substring(0, elementLength);
-                            if (elementLength == 1)
-                                y = "%" + y;
-
-                            info = new DateTimeInfo { IsReadOnly = false, Type = DateTimePart.Year, Format = y };
-                            break;
-                        }
-                    case '\\':
-                        {
-                            if (format.Length >= 2)
-                            {
-                                info = new DateTimeInfo { IsReadOnly = true, Content = format.Substring(1, 1), Length = 1, Type = DateTimePart.Other };
-                                elementLength = 2;
-                            }
-                            break;
-                        }
-                    case 'g':
-                        {
-                            string g = format.Substring(0, elementLength);
-                            if (elementLength == 1)
-                                g = "%" + g;
-
-                            info = new DateTimeInfo { IsReadOnly = true, Type = DateTimePart.Period, Format = format.Substring(0, elementLength) };
-                            break;
-                        }
-                    case 'm':
-                        {
-                            string m = format.Substring(0, elementLength);
-                            if (elementLength == 1)
-                                m = "%" + m;
-
-                            info = new DateTimeInfo { IsReadOnly = false, Type = DateTimePart.Minute, Format = m };
-                            break;
-                        }
-                    case 'z':
-                        {
-                            string z = format.Substring(0, elementLength);
-                            if (elementLength == 1)
-                                z = "%" + z;
-
-                            info = new DateTimeInfo { IsReadOnly = true, Type = DateTimePart.TimeZone, Format = z };
-                            break;
-                        }
-                    default:
-                        {
-                            elementLength = 1;
-                            info = new DateTimeInfo { IsReadOnly = true, Length = 1, Content = format[0].ToString(), Type = DateTimePart.Other };
-                            break;
-                        }
-                }
-
-                _dateTimeInfoList.Add(info);
-                format = format.Substring(elementLength);
+                  IsReadOnly = false,
+                  Type = DateTimePart.Day,
+                  Format = d
+                };
+              break;
             }
-        }
+          case 'F':
+          case 'f':
+            {
+              string f = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                f = "%" + f;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Millisecond,
+                Format = f
+              };
+              break;
+            }
+          case 'h':
+            {
+              string h = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                h = "%" + h;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Hour12,
+                Format = h
+              };
+              break;
+            }
+          case 'H':
+            {
+              string H = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                H = "%" + H;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Hour24,
+                Format = H
+              };
+              break;
+            }
+          case 'M':
+            {
+              string M = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                M = "%" + M;
 
-        private static int GetElementLengthByFormat(string format)
-        {
-            for (int i = 1; i < format.Length; i++)
+              if( elementLength >= 3 )
+                info = new DateTimeInfo
+                {
+                  IsReadOnly = false,
+                  Type = DateTimePart.MonthName,
+                  Format = M
+                };
+              else
+                info = new DateTimeInfo
+                {
+                  IsReadOnly = false,
+                  Type = DateTimePart.Month,
+                  Format = M
+                };
+              break;
+            }
+          case 'S':
+          case 's':
+            {
+              string s = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                s = "%" + s;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Second,
+                Format = s
+              };
+              break;
+            }
+          case 'T':
+          case 't':
+            {
+              string t = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                t = "%" + t;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.AmPmDesignator,
+                Format = t
+              };
+              break;
+            }
+          case 'Y':
+          case 'y':
             {
-                if (String.Compare(format[i].ToString(), format[0].ToString(), false) != 0)
+              string y = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                y = "%" + y;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Year,
+                Format = y
+              };
+              break;
+            }
+          case '\\':
+            {
+              if( format.Length >= 2 )
+              {
+                info = new DateTimeInfo
                 {
-                    return i;
-                }
+                  IsReadOnly = true,
+                  Content = format.Substring( 1, 1 ),
+                  Length = 1,
+                  Type = DateTimePart.Other
+                };
+                elementLength = 2;
+              }
+              break;
+            }
+          case 'g':
+            {
+              string g = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                g = "%" + g;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = true,
+                Type = DateTimePart.Period,
+                Format = format.Substring( 0, elementLength )
+              };
+              break;
+            }
+          case 'm':
+            {
+              string m = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                m = "%" + m;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = false,
+                Type = DateTimePart.Minute,
+                Format = m
+              };
+              break;
+            }
+          case 'z':
+            {
+              string z = format.Substring( 0, elementLength );
+              if( elementLength == 1 )
+                z = "%" + z;
+
+              info = new DateTimeInfo
+              {
+                IsReadOnly = true,
+                Type = DateTimePart.TimeZone,
+                Format = z
+              };
+              break;
+            }
+          default:
+            {
+              elementLength = 1;
+              info = new DateTimeInfo
+              {
+                IsReadOnly = true,
+                Length = 1,
+                Content = format[ 0 ].ToString(),
+                Type = DateTimePart.Other
+              };
+              break;
             }
-            return format.Length;
         }
 
-        private void ParseValueIntoDateTimeInfo()
-        {
-            string text = string.Empty;
+        _dateTimeInfoList.Add( info );
+        format = format.Substring( elementLength );
+      }
+    }
 
-            _dateTimeInfoList.ForEach(info =>
-            {
-                if (info.Format == null)
-                {
-                    info.StartPosition = text.Length;
-                    info.Length = info.Content.Length;
-                    text += info.Content;
-                }
-                else
-                {
-                    DateTime date = DateTime.Parse(Value.ToString());
-                    info.StartPosition = text.Length;
-                    info.Content = date.ToString(info.Format, CultureInfo.DateTimeFormat);
-                    info.Length = info.Content.Length;
-                    text += info.Content;
-                }
-            });
+    private static int GetElementLengthByFormat( string format )
+    {
+      for( int i = 1; i < format.Length; i++ )
+      {
+        if( String.Compare( format[ i ].ToString(), format[ 0 ].ToString(), false ) != 0 )
+        {
+          return i;
         }
+      }
+      return format.Length;
+    }
+
+    private void ParseValueIntoDateTimeInfo()
+    {
+      string text = string.Empty;
 
-        private void PerformMouseSelection()
+      _dateTimeInfoList.ForEach( info =>
+      {
+        if( info.Format == null )
         {
-            _dateTimeInfoList.ForEach(info =>
-            {
-                if ((info.StartPosition <= TextBox.SelectionStart) && (TextBox.SelectionStart < (info.StartPosition + info.Length)))
-                {
-                    Select(info);
-                    return;
-                }
-            });
+          info.StartPosition = text.Length;
+          info.Length = info.Content.Length;
+          text += info.Content;
         }
-
-        private void Select(DateTimeInfo info)
+        else
         {
-            _fireSelectionChangedEvent = false;
-            TextBox.Select(info.StartPosition, info.Length);
-            _fireSelectionChangedEvent = true;
-            _selectedDateTimeInfo = info;
+          DateTime date = DateTime.Parse( Value.ToString() );
+          info.StartPosition = text.Length;
+          info.Content = date.ToString( info.Format, CultureInfo.DateTimeFormat );
+          info.Length = info.Content.Length;
+          text += info.Content;
         }
+      } );
+    }
 
-        private string GetFormatString(DateTimeFormat dateTimeFormat)
+    private void PerformMouseSelection()
+    {
+      _dateTimeInfoList.ForEach( info =>
+      {
+        if( ( info.StartPosition <= TextBox.SelectionStart ) && ( TextBox.SelectionStart < ( info.StartPosition + info.Length ) ) )
         {
-            switch (dateTimeFormat)
-            {
-                case DateTimeFormat.ShortDate:
-                    return CultureInfo.DateTimeFormat.ShortDatePattern;
-                case DateTimeFormat.LongDate:
-                    return CultureInfo.DateTimeFormat.LongDatePattern;
-                case DateTimeFormat.ShortTime:
-                    return CultureInfo.DateTimeFormat.ShortTimePattern;
-                case DateTimeFormat.LongTime:
-                    return CultureInfo.DateTimeFormat.LongTimePattern;
-                case DateTimeFormat.FullDateTime:
-                    return CultureInfo.DateTimeFormat.FullDateTimePattern;
-                case DateTimeFormat.MonthDay:
-                    return CultureInfo.DateTimeFormat.MonthDayPattern;
-                case DateTimeFormat.RFC1123:
-                    return CultureInfo.DateTimeFormat.RFC1123Pattern;
-                case DateTimeFormat.SortableDateTime:
-                    return CultureInfo.DateTimeFormat.SortableDateTimePattern;
-                case DateTimeFormat.UniversalSortableDateTime:
-                    return CultureInfo.DateTimeFormat.UniversalSortableDateTimePattern;
-                case DateTimeFormat.YearMonth:
-                    return CultureInfo.DateTimeFormat.YearMonthPattern;
-                case DateTimeFormat.Custom:
-                    return FormatString;
-                default:
-                    throw new ArgumentException("Not a supported format");
-            }
+          Select( info );
+          return;
         }
+      } );
+    }
 
-        private void UpdateDateTime(int value)
-        {
-            _fireSelectionChangedEvent = false;
-            DateTimeInfo info = _selectedDateTimeInfo;
+    private void Select( DateTimeInfo info )
+    {
+      _fireSelectionChangedEvent = false;
+      TextBox.Select( info.StartPosition, info.Length );
+      _fireSelectionChangedEvent = true;
+      _selectedDateTimeInfo = info;
+    }
+
+    private string GetFormatString( DateTimeFormat dateTimeFormat )
+    {
+      switch( dateTimeFormat )
+      {
+        case DateTimeFormat.ShortDate:
+          return CultureInfo.DateTimeFormat.ShortDatePattern;
+        case DateTimeFormat.LongDate:
+          return CultureInfo.DateTimeFormat.LongDatePattern;
+        case DateTimeFormat.ShortTime:
+          return CultureInfo.DateTimeFormat.ShortTimePattern;
+        case DateTimeFormat.LongTime:
+          return CultureInfo.DateTimeFormat.LongTimePattern;
+        case DateTimeFormat.FullDateTime:
+          return CultureInfo.DateTimeFormat.FullDateTimePattern;
+        case DateTimeFormat.MonthDay:
+          return CultureInfo.DateTimeFormat.MonthDayPattern;
+        case DateTimeFormat.RFC1123:
+          return CultureInfo.DateTimeFormat.RFC1123Pattern;
+        case DateTimeFormat.SortableDateTime:
+          return CultureInfo.DateTimeFormat.SortableDateTimePattern;
+        case DateTimeFormat.UniversalSortableDateTime:
+          return CultureInfo.DateTimeFormat.UniversalSortableDateTimePattern;
+        case DateTimeFormat.YearMonth:
+          return CultureInfo.DateTimeFormat.YearMonthPattern;
+        case DateTimeFormat.Custom:
+          return FormatString;
+        default:
+          throw new ArgumentException( "Not a supported format" );
+      }
+    }
+
+    private void UpdateDateTime( int value )
+    {
+      _fireSelectionChangedEvent = false;
+      DateTimeInfo info = _selectedDateTimeInfo;
 
-            //this only occurs when the user manually type in a value for the Value Property
-            if (info == null)
-                info = _dateTimeInfoList[0];
+      //this only occurs when the user manually type in a value for the Value Property
+      if( info == null )
+        info = _dateTimeInfoList[ 0 ];
 
-            try
+      try
+      {
+        switch( info.Type )
+        {
+          case DateTimePart.Year:
             {
-                switch (info.Type)
-                {
-                    case DateTimePart.Year:
-                        {
-                            Value = ((DateTime)Value).AddYears(value);
-                            break;
-                        }
-                    case DateTimePart.Month:
-                    case DateTimePart.MonthName:
-                        {
-                            Value = ((DateTime)Value).AddMonths(value);
-                            break;
-                        }
-                    case DateTimePart.Day:
-                    case DateTimePart.DayName:
-                        {
-                            Value = ((DateTime)Value).AddDays(value);
-                            break;
-                        }
-                    case DateTimePart.Hour12:
-                    case DateTimePart.Hour24:
-                        {
-                            Value = ((DateTime)Value).AddHours(value);
-                            break;
-                        }
-                    case DateTimePart.Minute:
-                        {
-                            Value = ((DateTime)Value).AddMinutes(value);
-                            break;
-                        }
-                    case DateTimePart.Second:
-                        {
-                            Value = ((DateTime)Value).AddSeconds(value);
-                            break;
-                        }
-                    case DateTimePart.Millisecond:
-                        {
-                            Value = ((DateTime)Value).AddMilliseconds(value);
-                            break;
-                        }
-                    case DateTimePart.AmPmDesignator:
-                        {
-                            Value = ((DateTime)Value).AddHours(value * 12);
-                            break;
-                        }
-                    default:
-                        {
-                            break;
-                        }
-                }
+              Value = ( ( DateTime )Value ).AddYears( value );
+              break;
             }
-            catch
+          case DateTimePart.Month:
+          case DateTimePart.MonthName:
             {
-                //this can occur if the date/time = 1/1/0001 12:00:00 AM which is the smallest date allowed.
-                //I could write code that would validate the date each and everytime but I think that it would be more
-                //efficient if I just handle the edge case and allow an exeption to occur and swallow it instead.
+              Value = ( ( DateTime )Value ).AddMonths( value );
+              break;
+            }
+          case DateTimePart.Day:
+          case DateTimePart.DayName:
+            {
+              Value = ( ( DateTime )Value ).AddDays( value );
+              break;
+            }
+          case DateTimePart.Hour12:
+          case DateTimePart.Hour24:
+            {
+              Value = ( ( DateTime )Value ).AddHours( value );
+              break;
+            }
+          case DateTimePart.Minute:
+            {
+              Value = ( ( DateTime )Value ).AddMinutes( value );
+              break;
+            }
+          case DateTimePart.Second:
+            {
+              Value = ( ( DateTime )Value ).AddSeconds( value );
+              break;
+            }
+          case DateTimePart.Millisecond:
+            {
+              Value = ( ( DateTime )Value ).AddMilliseconds( value );
+              break;
+            }
+          case DateTimePart.AmPmDesignator:
+            {
+              Value = ( ( DateTime )Value ).AddHours( value * 12 );
+              break;
+            }
+          default:
+            {
+              break;
             }
-
-            //we loose our selection when the Value is set so we need to reselect it without firing the selection changed event
-            TextBox.Select(info.StartPosition, info.Length);
-            _fireSelectionChangedEvent = true;
         }
+      }
+      catch
+      {
+        //this can occur if the date/time = 1/1/0001 12:00:00 AM which is the smallest date allowed.
+        //I could write code that would validate the date each and everytime but I think that it would be more
+        //efficient if I just handle the edge case and allow an exeption to occur and swallow it instead.
+      }
+
+      //we loose our selection when the Value is set so we need to reselect it without firing the selection changed event
+      TextBox.Select( info.StartPosition, info.Length );
+      _fireSelectionChangedEvent = true;
+    }
 
-        private void UpdateTextFormatting()
-        {
-            _processTextChanged = false;
-
-            if (Value.HasValue)
-                Text = ConvertValueToText();
+    private void UpdateTextFormatting()
+    {
+      _processTextChanged = false;
 
-            _processTextChanged = true;
-        }
+      if( Value.HasValue )
+        Text = ConvertValueToText();
 
-        #endregion //Methods
+      _processTextChanged = true;
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
index df33cad9..e455fc53 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
@@ -1,51 +1,75 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls">
 
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
-    </DataTemplate>
-    
-    <!-- =============================================================================== -->
-    <!-- DateTimeUpDown                                                                  -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:DateTimeUpDown}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Right" />
-        <Setter Property="TextAlignment" Value="Right" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
-                    <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
-                                         AllowSpin="{TemplateBinding AllowSpin}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                        <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0" 
-                                                Background="Transparent"
-                                                ContextMenu="{TemplateBinding ContextMenu}"
-                                                FontFamily="{TemplateBinding FontFamily}" 
-                                                FontSize="{TemplateBinding FontSize}" 
-                                                FontStretch="{TemplateBinding FontStretch}"
-                                                FontStyle="{TemplateBinding FontStyle}" 
-                                                FontWeight="{TemplateBinding FontWeight}" 
-                                                Foreground="{TemplateBinding Foreground}" 
-                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                                                MinWidth="20" AcceptsReturn="False" 
-                                                Padding="0"
-                                                TextAlignment="{TemplateBinding TextAlignment}"
-                                                TextWrapping="NoWrap" 
-                                                TabIndex="{TemplateBinding TabIndex}"
-                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Watermark="{TemplateBinding Watermark}"
-                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}"/>
-                    </local:ButtonSpinner>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <!-- =============================================================================== -->
+   <!-- DateTimeUpDown                                                                  -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DateTimeUpDown}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
+               <local:ButtonSpinner x:Name="Spinner"
+                                    IsTabStop="False"
+                                    Background="{TemplateBinding Background}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    AllowSpin="{TemplateBinding AllowSpin}"
+                                    ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                  <local:WatermarkTextBox x:Name="TextBox"
+                                          BorderThickness="0" 
+                                          Background="Transparent"
+                                          ContextMenu="{TemplateBinding ContextMenu}"
+                                          FontFamily="{TemplateBinding FontFamily}" 
+                                          FontSize="{TemplateBinding FontSize}" 
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}" 
+                                          FontWeight="{TemplateBinding FontWeight}" 
+                                          Foreground="{TemplateBinding Foreground}" 
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="0"
+                                          TextAlignment="{TemplateBinding TextAlignment}"
+                                          TextWrapping="NoWrap" 
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          Watermark="{TemplateBinding Watermark}"
+                                          WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+               </local:ButtonSpinner>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs
index 32cf8779..b75f146b 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Implementation/DropDownButton.cs
@@ -1,297 +1,366 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
-using System.ComponentModel;
 using System.Windows.Controls.Primitives;
+using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls
 {
-    public class DropDownButton : ContentControl, ICommandSource
+  public class DropDownButton : ContentControl, ICommandSource
+  {
+    #region Constructors
+
+    static DropDownButton()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DropDownButton ), new FrameworkPropertyMetadata( typeof( DropDownButton ) ) );
+    }
+
+    public DropDownButton()
+    {
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Properties
+
+    private System.Windows.Controls.Primitives.ButtonBase _button;
+    protected System.Windows.Controls.Primitives.ButtonBase Button
+    {
+      get
+      {
+        return _button;
+      }
+      set
+      {
+        if( _button != null )
+          _button.Click -= DropDownButton_Click;
+
+        _button = value;
+
+        if( _button != null )
+          _button.Click += DropDownButton_Click;
+      }
+    }
+
+    #region DropDownContent
+
+    public static readonly DependencyProperty DropDownContentProperty = DependencyProperty.Register( "DropDownContent", typeof( object ), typeof( DropDownButton ), new UIPropertyMetadata( null, OnDropDownContentChanged ) );
+    public object DropDownContent
     {
-        #region Constructors
-
-        static DropDownButton()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(DropDownButton), new FrameworkPropertyMetadata(typeof(DropDownButton)));
-        }
-
-        public DropDownButton()
-        {
-            Keyboard.AddKeyDownHandler(this, OnKeyDown);
-            Mouse.AddPreviewMouseDownOutsideCapturedElementHandler(this, OnMouseDownOutsideCapturedElement);
-        }
-
-        #endregion //Constructors
-
-        #region Properties
-
-        private System.Windows.Controls.Primitives.ButtonBase _button;
-        protected System.Windows.Controls.Primitives.ButtonBase Button
-        {
-            get { return _button; }
-            set
-            {
-                if (_button != null)
-                    _button.Click -= DropDownButton_Click;
-
-                _button = value;
-
-                if (_button != null)
-                    _button.Click += DropDownButton_Click;
-            }
-        }
-
-        #region DropDownContent
-
-        public static readonly DependencyProperty DropDownContentProperty = DependencyProperty.Register("DropDownContent", typeof(object), typeof(DropDownButton), new UIPropertyMetadata(null, OnDropDownContentChanged));
-        public object DropDownContent
-        {
-            get { return (object)GetValue(DropDownContentProperty); }
-            set { SetValue(DropDownContentProperty, value); }
-        }
-
-        private static void OnDropDownContentChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            DropDownButton dropDownButton = o as DropDownButton;
-            if (dropDownButton != null)
-                dropDownButton.OnDropDownContentChanged((object)e.OldValue, (object)e.NewValue);
-        }
-
-        protected virtual void OnDropDownContentChanged(object oldValue, object newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
-
-        #endregion //DropDownContent
-
-        #region IsOpen
-
-        public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register("IsOpen", typeof(bool), typeof(DropDownButton), new UIPropertyMetadata(false, OnIsOpenChanged));
-        public bool IsOpen
-        {
-            get { return (bool)GetValue(IsOpenProperty); }
-            set { SetValue(IsOpenProperty, value); }
-        }
-
-        private static void OnIsOpenChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            DropDownButton dropDownButton = o as DropDownButton;
-            if (dropDownButton != null)
-                dropDownButton.OnIsOpenChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
-
-        protected virtual void OnIsOpenChanged(bool oldValue, bool newValue)
-        {
-            if (newValue)
-                RaiseRoutedEvent(DropDownButton.OpenedEvent);
-            else
-                RaiseRoutedEvent(DropDownButton.ClosedEvent);
-        }
-
-        #endregion //IsOpen
-
-        #endregion //Properties
-
-        #region Base Class Overrides
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-            Button = GetTemplateChild("PART_DropDownButton") as ToggleButton;
-        }
-
-        #endregion //Base Class Overrides
-
-        #region Events
-
-        public static readonly RoutedEvent ClickEvent = EventManager.RegisterRoutedEvent("Click", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(DropDownButton));
-        public event RoutedEventHandler Click
-        {
-            add { AddHandler(ClickEvent, value); }
-            remove { RemoveHandler(ClickEvent, value); }
-        }
-
-        public static readonly RoutedEvent OpenedEvent = EventManager.RegisterRoutedEvent("Opened", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(DropDownButton));
-        public event RoutedEventHandler Opened
-        {
-            add { AddHandler(OpenedEvent, value); }
-            remove { RemoveHandler(OpenedEvent, value); }
-        }
-
-        public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent("Closed", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(DropDownButton));
-        public event RoutedEventHandler Closed
-        {
-            add { AddHandler(ClosedEvent, value); }
-            remove { RemoveHandler(ClosedEvent, value); }
-        }
-
-        #endregion //Events
-
-        #region Event Handlers
-
-        private void OnKeyDown(object sender, KeyEventArgs e)
-        {
-            switch (e.Key)
-            {
-                case Key.Escape:
-                    {
-                        CloseDropDown();
-                        break;
-                    }
-            }
-        }
-
-        private void OnMouseDownOutsideCapturedElement(object sender, MouseButtonEventArgs e)
-        {
+      get
+      {
+        return ( object )GetValue( DropDownContentProperty );
+      }
+      set
+      {
+        SetValue( DropDownContentProperty, value );
+      }
+    }
+
+    private static void OnDropDownContentChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      DropDownButton dropDownButton = o as DropDownButton;
+      if( dropDownButton != null )
+        dropDownButton.OnDropDownContentChanged( ( object )e.OldValue, ( object )e.NewValue );
+    }
+
+    protected virtual void OnDropDownContentChanged( object oldValue, object newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
+
+    #endregion //DropDownContent
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( DropDownButton ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
+
+    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      DropDownButton dropDownButton = o as DropDownButton;
+      if( dropDownButton != null )
+        dropDownButton.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
+
+    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
+    {
+      if( newValue )
+        RaiseRoutedEvent( DropDownButton.OpenedEvent );
+      else
+        RaiseRoutedEvent( DropDownButton.ClosedEvent );
+    }
+
+    #endregion //IsOpen
+
+    #endregion //Properties
+
+    #region Base Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+      Button = GetTemplateChild( "PART_DropDownButton" ) as ToggleButton;
+    }
+
+    #endregion //Base Class Overrides
+
+    #region Events
+
+    public static readonly RoutedEvent ClickEvent = EventManager.RegisterRoutedEvent( "Click", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
+    public event RoutedEventHandler Click
+    {
+      add
+      {
+        AddHandler( ClickEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ClickEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent OpenedEvent = EventManager.RegisterRoutedEvent( "Opened", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
+    public event RoutedEventHandler Opened
+    {
+      add
+      {
+        AddHandler( OpenedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( OpenedEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent ClosedEvent = EventManager.RegisterRoutedEvent( "Closed", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( DropDownButton ) );
+    public event RoutedEventHandler Closed
+    {
+      add
+      {
+        AddHandler( ClosedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ClosedEvent, value );
+      }
+    }
+
+    #endregion //Events
+
+    #region Event Handlers
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+          {
             CloseDropDown();
-        }
-
-        private void DropDownButton_Click(object sender, RoutedEventArgs e)
-        {
-            OnClick();
-        }
-
-        void CanExecuteChanged(object sender, EventArgs e)
-        {
-            CanExecuteChanged();
-        }
-
-        #endregion //Event Handlers
-
-        #region Methods
-
-        private void CanExecuteChanged()
-        {
-            if (Command != null)
-            {
-                RoutedCommand command = Command as RoutedCommand;
-
-                // If a RoutedCommand.
-                if (command != null)
-                    IsEnabled = command.CanExecute(CommandParameter, CommandTarget) ? true : false;
-                // If a not RoutedCommand.
-                else
-                    IsEnabled = Command.CanExecute(CommandParameter) ? true : false;
-            }
-        }
-
-        /// <summary>
-        /// Closes the drop down.
-        /// </summary>
-        private void CloseDropDown()
-        {
-            if (IsOpen)
-                IsOpen = false;
-            ReleaseMouseCapture();
-        }
-
-        protected virtual void OnClick()
-        {
-            RaiseRoutedEvent(DropDownButton.ClickEvent);
-            RaiseCommand();
-        }
-
-        /// <summary>
-        /// Raises routed events.
-        /// </summary>
-        private void RaiseRoutedEvent(RoutedEvent routedEvent)
-        {
-            RoutedEventArgs args = new RoutedEventArgs(routedEvent, this);
-            RaiseEvent(args);
-        }
-
-        /// <summary>
-        /// Raises the command's Execute event.
-        /// </summary>
-        private void RaiseCommand()
-        {
-            if (Command != null)
-            {
-                RoutedCommand routedCommand = Command as RoutedCommand;
-
-                if (routedCommand == null)
-                    ((ICommand)Command).Execute(CommandParameter);
-                else
-                    routedCommand.Execute(CommandParameter, CommandTarget);
-            }
-        }
-
-        /// <summary>
-        /// Unhooks a command from the Command property.
-        /// </summary>
-        /// <param name="oldCommand">The old command.</param>
-        /// <param name="newCommand">The new command.</param>
-        private void UnhookCommand(ICommand oldCommand, ICommand newCommand)
-        {
-            EventHandler handler = CanExecuteChanged;
-            oldCommand.CanExecuteChanged -= handler;
-        }
-
-        /// <summary>
-        /// Hooks up a command to the CanExecuteChnaged event handler.
-        /// </summary>
-        /// <param name="oldCommand">The old command.</param>
-        /// <param name="newCommand">The new command.</param>
-        private void HookUpCommand(ICommand oldCommand, ICommand newCommand)
-        {
-            EventHandler handler = new EventHandler(CanExecuteChanged);
-            canExecuteChangedHandler = handler;
-            if (newCommand != null)
-                newCommand.CanExecuteChanged += canExecuteChangedHandler;
-        }
-
-        #endregion //Methods
-
-        #region ICommandSource Members
-
-        // Keeps a copy of the CanExecuteChnaged handler so it doesn't get garbage collected.
-        private EventHandler canExecuteChangedHandler;
-
-        #region Command
-
-        public static readonly DependencyProperty CommandProperty = DependencyProperty.Register("Command", typeof(ICommand), typeof(DropDownButton), new PropertyMetadata((ICommand)null, OnCommandChanged));
-        [TypeConverter(typeof(CommandConverter))]
-        public ICommand Command
-        {
-            get { return (ICommand)GetValue(CommandProperty); }
-            set { SetValue(CommandProperty, value); }
-        }
-
-        private static void OnCommandChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            DropDownButton dropDownButton = d as DropDownButton;
-            if (dropDownButton != null)
-                dropDownButton.OnCommandChanged((ICommand)e.OldValue, (ICommand)e.NewValue);
-        }
-
-        protected virtual void OnCommandChanged(ICommand oldValue, ICommand newValue)
-        {
-            // If old command is not null, then we need to remove the handlers.
-            if (oldValue != null)
-                UnhookCommand(oldValue, newValue);
-
-            HookUpCommand(oldValue, newValue);
-
-            CanExecuteChanged(); //may need to call this when changing the command parameter or target.
-        }
-
-        #endregion //Command
-
-        public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register("CommandParameter", typeof(object), typeof(DropDownButton), new PropertyMetadata(null));
-        public object CommandParameter
-        {
-            get { return GetValue(CommandParameterProperty); }
-            set { SetValue(CommandParameterProperty, value); }
-        }
-
-        public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register("CommandTarget", typeof(IInputElement), typeof(DropDownButton), new PropertyMetadata(null));
-        public IInputElement CommandTarget
-        {
-            get { return (IInputElement)GetValue(CommandTargetProperty); }
-            set { SetValue(CommandTargetProperty, value); }
-        }
-
-        #endregion //ICommandSource Members
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseDropDown();
+    }
+
+    private void DropDownButton_Click( object sender, RoutedEventArgs e )
+    {
+      OnClick();
+    }
+
+    void CanExecuteChanged( object sender, EventArgs e )
+    {
+      CanExecuteChanged();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void CanExecuteChanged()
+    {
+      if( Command != null )
+      {
+        RoutedCommand command = Command as RoutedCommand;
+
+        // If a RoutedCommand.
+        if( command != null )
+          IsEnabled = command.CanExecute( CommandParameter, CommandTarget ) ? true : false;
+        // If a not RoutedCommand.
+        else
+          IsEnabled = Command.CanExecute( CommandParameter ) ? true : false;
+      }
+    }
+
+    /// <summary>
+    /// Closes the drop down.
+    /// </summary>
+    private void CloseDropDown()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    protected virtual void OnClick()
+    {
+      RaiseRoutedEvent( DropDownButton.ClickEvent );
+      RaiseCommand();
+    }
+
+    /// <summary>
+    /// Raises routed events.
+    /// </summary>
+    private void RaiseRoutedEvent( RoutedEvent routedEvent )
+    {
+      RoutedEventArgs args = new RoutedEventArgs( routedEvent, this );
+      RaiseEvent( args );
+    }
+
+    /// <summary>
+    /// Raises the command's Execute event.
+    /// </summary>
+    private void RaiseCommand()
+    {
+      if( Command != null )
+      {
+        RoutedCommand routedCommand = Command as RoutedCommand;
+
+        if( routedCommand == null )
+          ( ( ICommand )Command ).Execute( CommandParameter );
+        else
+          routedCommand.Execute( CommandParameter, CommandTarget );
+      }
     }
+
+    /// <summary>
+    /// Unhooks a command from the Command property.
+    /// </summary>
+    /// <param name="oldCommand">The old command.</param>
+    /// <param name="newCommand">The new command.</param>
+    private void UnhookCommand( ICommand oldCommand, ICommand newCommand )
+    {
+      EventHandler handler = CanExecuteChanged;
+      oldCommand.CanExecuteChanged -= handler;
+    }
+
+    /// <summary>
+    /// Hooks up a command to the CanExecuteChnaged event handler.
+    /// </summary>
+    /// <param name="oldCommand">The old command.</param>
+    /// <param name="newCommand">The new command.</param>
+    private void HookUpCommand( ICommand oldCommand, ICommand newCommand )
+    {
+      EventHandler handler = new EventHandler( CanExecuteChanged );
+      canExecuteChangedHandler = handler;
+      if( newCommand != null )
+        newCommand.CanExecuteChanged += canExecuteChangedHandler;
+    }
+
+    #endregion //Methods
+
+    #region ICommandSource Members
+
+    // Keeps a copy of the CanExecuteChnaged handler so it doesn't get garbage collected.
+    private EventHandler canExecuteChangedHandler;
+
+    #region Command
+
+    public static readonly DependencyProperty CommandProperty = DependencyProperty.Register( "Command", typeof( ICommand ), typeof( DropDownButton ), new PropertyMetadata( ( ICommand )null, OnCommandChanged ) );
+    [TypeConverter( typeof( CommandConverter ) )]
+    public ICommand Command
+    {
+      get
+      {
+        return ( ICommand )GetValue( CommandProperty );
+      }
+      set
+      {
+        SetValue( CommandProperty, value );
+      }
+    }
+
+    private static void OnCommandChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      DropDownButton dropDownButton = d as DropDownButton;
+      if( dropDownButton != null )
+        dropDownButton.OnCommandChanged( ( ICommand )e.OldValue, ( ICommand )e.NewValue );
+    }
+
+    protected virtual void OnCommandChanged( ICommand oldValue, ICommand newValue )
+    {
+      // If old command is not null, then we need to remove the handlers.
+      if( oldValue != null )
+        UnhookCommand( oldValue, newValue );
+
+      HookUpCommand( oldValue, newValue );
+
+      CanExecuteChanged(); //may need to call this when changing the command parameter or target.
+    }
+
+    #endregion //Command
+
+    public static readonly DependencyProperty CommandParameterProperty = DependencyProperty.Register( "CommandParameter", typeof( object ), typeof( DropDownButton ), new PropertyMetadata( null ) );
+    public object CommandParameter
+    {
+      get
+      {
+        return GetValue( CommandParameterProperty );
+      }
+      set
+      {
+        SetValue( CommandParameterProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CommandTargetProperty = DependencyProperty.Register( "CommandTarget", typeof( IInputElement ), typeof( DropDownButton ), new PropertyMetadata( null ) );
+    public IInputElement CommandTarget
+    {
+      get
+      {
+        return ( IInputElement )GetValue( CommandTargetProperty );
+      }
+      set
+      {
+        SetValue( CommandTargetProperty, value );
+      }
+    }
+
+    #endregion //ICommandSource Members
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml
index f05249a2..2b80da2a 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml
@@ -1,83 +1,102 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters"
-                    xmlns:local="clr-namespace:Microsoft.Windows.Controls" >
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <Style TargetType="{x:Type local:DropDownButton}">
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Padding" Value="3"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:DropDownButton}">
-                    <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
-                        <ToggleButton x:Name="PART_DropDownButton" Grid.Column="1"
-                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" >
-                            <ToggleButton.Template>
-                                <ControlTemplate TargetType="ToggleButton">
-                                    <ContentPresenter />
-                                </ControlTemplate>
-                            </ToggleButton.Template>
-                            <Grid>
-                                <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                                     CornerRadius="2.75"
-                                                    RenderChecked="{TemplateBinding IsOpen}"
-                                                    RenderEnabled="{TemplateBinding IsEnabled}"
-											        RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
-											        RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}" >
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <ContentPresenter Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
-                                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3" Grid.Column="1">
-                                            <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                        </Grid>
-                                    </Grid>
-                                </chrome:ButtonChrome>
-                            </Grid>
-                        </ToggleButton>
+   <Style TargetType="{x:Type local:DropDownButton}">
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DropDownButton}">
+               <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
+                  <ToggleButton x:Name="PART_DropDownButton"
+                                Grid.Column="1"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+                     <ToggleButton.Template>
+                        <ControlTemplate TargetType="ToggleButton">
+                           <ContentPresenter />
+                        </ControlTemplate>
+                     </ToggleButton.Template>
+                     <Grid>
+                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                             CornerRadius="2.75"
+                                             RenderChecked="{TemplateBinding IsOpen}"
+                                             RenderEnabled="{TemplateBinding IsEnabled}"
+											            RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
+											            RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="Auto" />
+                              </Grid.ColumnDefinitions>
+                              <ContentPresenter Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
+                              <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3" Grid.Column="1">
+                                 <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                              </Grid>
+                           </Grid>
+                        </chrome:ButtonChrome>
+                     </Grid>
+                  </ToggleButton>
 
-                        <Popup x:Name="PART_Popup" 
-                               HorizontalOffset="1"
-                               VerticalOffset="1"
-                               AllowsTransparency="True"
-                               StaysOpen="False"
-                               Placement="Bottom"
-                               Focusable="False"
-                               IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}">
-                            <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" >
-                                <ContentPresenter Content="{TemplateBinding DropDownContent}" />
-                            </Border>
-                        </Popup>
+                  <Popup x:Name="PART_Popup" 
+                         HorizontalOffset="1"
+                         VerticalOffset="1"
+                         AllowsTransparency="True"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         Focusable="False"
+                         IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                        <ContentPresenter Content="{TemplateBinding DropDownContent}" />
+                     </Border>
+                  </Popup>
 
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs
index 1f672cda..46a6fede 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/BorderThicknessToStrokeThicknessConverter.cs
@@ -1,24 +1,42 @@
-using System;
-using System.Windows.Data;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
+using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls.Mag.Converters
 {
-    internal class BorderThicknessToStrokeThicknessConverter : IValueConverter
-    {
-        #region IValueConverter Members
+  internal class BorderThicknessToStrokeThicknessConverter : IValueConverter
+  {
+    #region IValueConverter Members
 
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            Thickness thickness = (Thickness)value;
-            return (thickness.Bottom + thickness.Left + thickness.Right + thickness.Top) / 4;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      Thickness thickness = ( Thickness )value;
+      return ( thickness.Bottom + thickness.Left + thickness.Right + thickness.Top ) / 4;
+    }
 
-        #endregion
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
     }
+
+    #endregion
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs
index 532a3552..d0f4dc1e 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Converters/RadiusConverter.cs
@@ -1,22 +1,40 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System;
 using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls.Mag.Converters
 {
-    internal class RadiusConverter : IValueConverter
-    {
-        #region IValueConverter Members
-
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            return (double)value * 2;
-        }
+  internal class RadiusConverter : IValueConverter
+  {
+    #region IValueConverter Members
 
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      return ( double )value * 2;
+    }
 
-        #endregion
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
     }
+
+    #endregion
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs
index 4cdeac5e..e510f987 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/FrameType.cs
@@ -1,10 +1,27 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls
 {
-    public enum FrameType
-    {
-        Circle,
-        Rectangle
-    }
+  public enum FrameType
+  {
+    Circle,
+    Rectangle
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs
index 7771b255..439ff1b7 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/Magnifier.cs
@@ -1,224 +1,282 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 using System.Windows.Controls;
 
 namespace Microsoft.Windows.Controls
 {
-    public class Magnifier : Control
-    {
-        #region Properties
+  public class Magnifier : Control
+  {
+    #region Properties
 
-        #region DefaultSize
+    #region DefaultSize
 
-        internal Size DefaultSize
+    internal Size DefaultSize
+    {
+      get
+      {
+        switch( FrameType )
         {
-            get
-            {
-                switch (FrameType)
-                {
-                    case FrameType.Circle:
-                        return new Size(2 * Radius, 2 * Radius);
-                    case FrameType.Rectangle:
-                        return new Size(Width, Height);
-                    default:
-                        return Size.Empty;
-                }
-            }
+          case FrameType.Circle:
+            return new Size( 2 * Radius, 2 * Radius );
+          case FrameType.Rectangle:
+            return new Size( Width, Height );
+          default:
+            return Size.Empty;
         }
+      }
+    }
 
-        #endregion //DefaultSize
-
-        #region FrameWidth
+    #endregion //DefaultSize
 
-        public static readonly DependencyProperty FrameWidthProperty = DependencyProperty.Register("FrameWidth", typeof(double), typeof(Magnifier), new UIPropertyMetadata(50.0));
-        internal double FrameWidth
-        {
-            get { return (double)GetValue(FrameWidthProperty); }
-            set { SetValue(FrameWidthProperty, value); }
-        }
+    #region FrameWidth
 
-        #endregion //MagnifierWidth
+    public static readonly DependencyProperty FrameWidthProperty = DependencyProperty.Register( "FrameWidth", typeof( double ), typeof( Magnifier ), new UIPropertyMetadata( 50.0 ) );
+    internal double FrameWidth
+    {
+      get
+      {
+        return ( double )GetValue( FrameWidthProperty );
+      }
+      set
+      {
+        SetValue( FrameWidthProperty, value );
+      }
+    }
 
-        #region FrameHeight
+    #endregion //MagnifierWidth
 
-        public static readonly DependencyProperty FrameHeightProperty = DependencyProperty.Register("FrameHeight", typeof(double), typeof(Magnifier), new UIPropertyMetadata(50.0));
-        internal double FrameHeight
-        {
-            get { return (double)GetValue(FrameHeightProperty); }
-            set { SetValue(FrameHeightProperty, value); }
-        }
+    #region FrameHeight
 
-        #endregion //FrameHeight
+    public static readonly DependencyProperty FrameHeightProperty = DependencyProperty.Register( "FrameHeight", typeof( double ), typeof( Magnifier ), new UIPropertyMetadata( 50.0 ) );
+    internal double FrameHeight
+    {
+      get
+      {
+        return ( double )GetValue( FrameHeightProperty );
+      }
+      set
+      {
+        SetValue( FrameHeightProperty, value );
+      }
+    }
 
-        #region FrameType
+    #endregion //FrameHeight
 
-        public static readonly DependencyProperty FrameTypeProperty = DependencyProperty.Register("FrameType", typeof(FrameType), typeof(Magnifier), new UIPropertyMetadata(FrameType.Circle, OnFrameTypeChanged));
-        public FrameType FrameType
-        {
-            get { return (FrameType)GetValue(FrameTypeProperty); }
-            set { SetValue(FrameTypeProperty, value); }
-        }
+    #region FrameType
 
-        private static void OnFrameTypeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            Magnifier m = (Magnifier)d;
-            m.OnFrameTypeChanged((FrameType)e.OldValue, (FrameType)e.NewValue);
-        }
+    public static readonly DependencyProperty FrameTypeProperty = DependencyProperty.Register( "FrameType", typeof( FrameType ), typeof( Magnifier ), new UIPropertyMetadata( FrameType.Circle, OnFrameTypeChanged ) );
+    public FrameType FrameType
+    {
+      get
+      {
+        return ( FrameType )GetValue( FrameTypeProperty );
+      }
+      set
+      {
+        SetValue( FrameTypeProperty, value );
+      }
+    }
 
-        protected virtual void OnFrameTypeChanged(FrameType oldValue, FrameType newValue)
-        {
-            if (newValue == Controls.FrameType.Circle)
-            {
-                Height = DefaultSize.Height;
-                Width = DefaultSize.Width;
-            }
+    private static void OnFrameTypeChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Magnifier m = ( Magnifier )d;
+      m.OnFrameTypeChanged( ( FrameType )e.OldValue, ( FrameType )e.NewValue );
+    }
 
-            ResolveViewBox();
-        }
+    protected virtual void OnFrameTypeChanged( FrameType oldValue, FrameType newValue )
+    {
+      if( newValue == Controls.FrameType.Circle )
+      {
+        Height = DefaultSize.Height;
+        Width = DefaultSize.Width;
+      }
 
-        #endregion //FrameType
+      ResolveViewBox();
+    }
 
-        #region Radius
+    #endregion //FrameType
 
-        public static readonly DependencyProperty RadiusProperty = DependencyProperty.Register("Radius", typeof(double), typeof(Magnifier), new FrameworkPropertyMetadata(50.0, new PropertyChangedCallback(OnRadiusPropertyChanged)));
-        public double Radius
-        {
-            get { return (double)GetValue(RadiusProperty); }
-            set { SetValue(RadiusProperty, value); }
-        }
+    #region Radius
 
-        private static void OnRadiusPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            Magnifier m = (Magnifier)d;
-            m.OnRadiusChanged(e);
-        }
+    public static readonly DependencyProperty RadiusProperty = DependencyProperty.Register( "Radius", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( 50.0, new PropertyChangedCallback( OnRadiusPropertyChanged ) ) );
+    public double Radius
+    {
+      get
+      {
+        return ( double )GetValue( RadiusProperty );
+      }
+      set
+      {
+        SetValue( RadiusProperty, value );
+      }
+    }
 
-        protected virtual void OnRadiusChanged(DependencyPropertyChangedEventArgs e)
-        {
-            ResolveViewBox();
-        }
+    private static void OnRadiusPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Magnifier m = ( Magnifier )d;
+      m.OnRadiusChanged( e );
+    }
 
-        #endregion //Radius
+    protected virtual void OnRadiusChanged( DependencyPropertyChangedEventArgs e )
+    {
+      ResolveViewBox();
+    }
 
-        #region Target
+    #endregion //Radius
 
-        public static readonly DependencyProperty TargetProperty = DependencyProperty.Register("Target", typeof(UIElement), typeof(Magnifier));
-        public UIElement Target
-        {
-            get { return (UIElement)GetValue(TargetProperty); }
-            set { SetValue(TargetProperty, value); }
-        }
+    #region Target
 
-        #endregion //Target
-
-        #region ViewBox
+    public static readonly DependencyProperty TargetProperty = DependencyProperty.Register( "Target", typeof( UIElement ), typeof( Magnifier ) );
+    public UIElement Target
+    {
+      get
+      {
+        return ( UIElement )GetValue( TargetProperty );
+      }
+      set
+      {
+        SetValue( TargetProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty ViewBoxProperty = DependencyProperty.Register("ViewBox", typeof(Rect), typeof(Magnifier), new FrameworkPropertyMetadata(default(Rect)));
-        internal Rect ViewBox
-        {
-            get { return (Rect)GetValue(ViewBoxProperty); }
-            set { SetValue(ViewBoxProperty, value); }
-        }
+    #endregion //Target
 
-        #endregion //ViewBox
+    #region ViewBox
 
-        #region ZoomFactor
+    public static readonly DependencyProperty ViewBoxProperty = DependencyProperty.Register( "ViewBox", typeof( Rect ), typeof( Magnifier ), new FrameworkPropertyMetadata( default( Rect ) ) );
+    internal Rect ViewBox
+    {
+      get
+      {
+        return ( Rect )GetValue( ViewBoxProperty );
+      }
+      set
+      {
+        SetValue( ViewBoxProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty ZoomFactorProperty = DependencyProperty.Register("ZoomFactor", typeof(double), typeof(Magnifier), new FrameworkPropertyMetadata(0.5, OnZoomFactorPropertyChanged, OnCoerceZoomFactorProperty));
-        public double ZoomFactor
-        {
-            get { return (double)GetValue(ZoomFactorProperty); }
-            set { SetValue(ZoomFactorProperty, value); }
-        }
+    #endregion //ViewBox
 
-        private static void OnZoomFactorPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            Magnifier m = (Magnifier)d;
-            m.OnZoomFactorChanged(e);
-        }
+    #region ZoomFactor
 
-        protected virtual void OnZoomFactorChanged(DependencyPropertyChangedEventArgs e)
-        {
-            ResolveViewBox();
-        }
+    public static readonly DependencyProperty ZoomFactorProperty = DependencyProperty.Register( "ZoomFactor", typeof( double ), typeof( Magnifier ), new FrameworkPropertyMetadata( 0.5, OnZoomFactorPropertyChanged, OnCoerceZoomFactorProperty ) );
+    public double ZoomFactor
+    {
+      get
+      {
+        return ( double )GetValue( ZoomFactorProperty );
+      }
+      set
+      {
+        SetValue( ZoomFactorProperty, value );
+      }
+    }
 
-        private static object OnCoerceZoomFactorProperty(DependencyObject d, object value)
-        {
-            Magnifier m = (Magnifier)d;
-            return m.OnCoerceZoomFactor(value);
-        }
+    private static void OnZoomFactorPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      Magnifier m = ( Magnifier )d;
+      m.OnZoomFactorChanged( e );
+    }
 
-        protected virtual object OnCoerceZoomFactor(object value)
-        {
-            double zoomFactor = (double)value;
+    protected virtual void OnZoomFactorChanged( DependencyPropertyChangedEventArgs e )
+    {
+      ResolveViewBox();
+    }
 
-            if (zoomFactor > 1)
-                zoomFactor = 1;
-            else if (zoomFactor < 0)
-                zoomFactor = 0;
+    private static object OnCoerceZoomFactorProperty( DependencyObject d, object value )
+    {
+      Magnifier m = ( Magnifier )d;
+      return m.OnCoerceZoomFactor( value );
+    }
 
-            return zoomFactor;
-        }
+    protected virtual object OnCoerceZoomFactor( object value )
+    {
+      double zoomFactor = ( double )value;
 
-        #endregion //ZoomFactor
+      if( zoomFactor > 1 )
+        zoomFactor = 1;
+      else if( zoomFactor < 0 )
+        zoomFactor = 0;
 
-        #endregion //Properties
+      return zoomFactor;
+    }
 
-        #region Constructors
+    #endregion //ZoomFactor
 
-        /// <summary>
-        /// Initializes static members of the <see cref="Magnifier"/> class.
-        /// </summary>
-        static Magnifier()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(Magnifier), new FrameworkPropertyMetadata(typeof(Magnifier)));
-            HeightProperty.OverrideMetadata(typeof(Magnifier), new FrameworkPropertyMetadata(100.0));
-            WidthProperty.OverrideMetadata(typeof(Magnifier), new FrameworkPropertyMetadata(100.0));
-        }
+    #endregion //Properties
 
-        public Magnifier()
-        {
-            ResolveViewBox();
-        }
+    #region Constructors
 
-        #endregion
+    /// <summary>
+    /// Initializes static members of the <see cref="Magnifier"/> class.
+    /// </summary>
+    static Magnifier()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( typeof( Magnifier ) ) );
+      HeightProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( 100.0 ) );
+      WidthProperty.OverrideMetadata( typeof( Magnifier ), new FrameworkPropertyMetadata( 100.0 ) );
+    }
 
-        #region Base Class Overrides
+    public Magnifier()
+    {
+      ResolveViewBox();
+    }
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+    #endregion
 
-            if (FrameType == Controls.FrameType.Circle)
-            {
-                Height = DefaultSize.Height;
-                Width = DefaultSize.Width;
-            }
+    #region Base Class Overrides
 
-            ResolveViewBox();
-        }
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-        #endregion // Base Class Overrides
+      if( FrameType == Controls.FrameType.Circle )
+      {
+        Height = DefaultSize.Height;
+        Width = DefaultSize.Width;
+      }
 
-        #region Methods
+      ResolveViewBox();
+    }
 
-        private void ResolveViewBox()
-        {
-            if (!IsInitialized)
-                return;
+    #endregion // Base Class Overrides
 
-            double correction = (BorderThickness.Bottom + BorderThickness.Left + BorderThickness.Right + BorderThickness.Top == 0) ? 1 : 0;
+    #region Methods
 
-            double width = DefaultSize.Width * ZoomFactor;
-            double height = DefaultSize.Height * ZoomFactor;
+    private void ResolveViewBox()
+    {
+      if( !IsInitialized )
+        return;
 
-            FrameWidth = DefaultSize.Width - correction;
-            FrameHeight = DefaultSize.Height - correction;
+      double correction = ( BorderThickness.Bottom + BorderThickness.Left + BorderThickness.Right + BorderThickness.Top == 0 ) ? 1 : 0;
 
-            ViewBox = new Rect(ViewBox.Location, new Size(width, height));
-        }
+      double width = DefaultSize.Width * ZoomFactor;
+      double height = DefaultSize.Height * ZoomFactor;
 
-        #endregion //Methods
+      FrameWidth = DefaultSize.Width - correction;
+      FrameHeight = DefaultSize.Height - correction;
 
+      ViewBox = new Rect( ViewBox.Location, new Size( width, height ) );
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs
index 2b31e80f..c7b87ca6 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierAdorner.cs
@@ -1,96 +1,116 @@
-using System;
-using System.Windows.Documents;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
+using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 
 namespace Microsoft.Windows.Controls
 {
-    public class MagnifierAdorner : Adorner
-    {
-        #region Members
-
-        private Magnifier _magnifier;
-        private Point _currentMousePosition;
+  public class MagnifierAdorner : Adorner
+  {
+    #region Members
 
-        #endregion
+    private Magnifier _magnifier;
+    private Point _currentMousePosition;
 
-        #region Constructors
+    #endregion
 
-        public MagnifierAdorner(UIElement element, Magnifier magnifier)
-            : base(element)
-        {
-            InputManager.Current.PostProcessInput += Current_PostProcessInput;
-            _magnifier = magnifier;            
-            UpdateViewBox();
-            AddVisualChild(_magnifier);         
-        }
+    #region Constructors
 
-        #endregion
+    public MagnifierAdorner( UIElement element, Magnifier magnifier )
+      : base( element )
+    {
+      InputManager.Current.PostProcessInput += Current_PostProcessInput;
+      _magnifier = magnifier;
+      UpdateViewBox();
+      AddVisualChild( _magnifier );
+    }
 
-        #region Private/Internal methods
+    #endregion
 
-        private void Current_PostProcessInput(object sender, ProcessInputEventArgs e)
-        {
-            Point pt = Mouse.GetPosition(this);
+    #region Private/Internal methods
 
-            if (_currentMousePosition == pt)
-                return;
+    private void Current_PostProcessInput( object sender, ProcessInputEventArgs e )
+    {
+      Point pt = Mouse.GetPosition( this );
 
-            _currentMousePosition = pt;
-            UpdateViewBox();
-            InvalidateArrange();
-        }
+      if( _currentMousePosition == pt )
+        return;
 
-        internal void UpdateViewBox()
-        {
-            var viewBoxLocation = CalculateViewBoxLocation();
-            _magnifier.ViewBox = new Rect(viewBoxLocation, _magnifier.ViewBox.Size);
-        }
+      _currentMousePosition = pt;
+      UpdateViewBox();
+      InvalidateArrange();
+    }
 
-        private Point CalculateViewBoxLocation()
-        {
-            double offsetX = 0, offsetY = 0;
+    internal void UpdateViewBox()
+    {
+      var viewBoxLocation = CalculateViewBoxLocation();
+      _magnifier.ViewBox = new Rect( viewBoxLocation, _magnifier.ViewBox.Size );
+    }
 
-            Point adorner = Mouse.GetPosition(this);
-            Point element = Mouse.GetPosition(AdornedElement);
+    private Point CalculateViewBoxLocation()
+    {
+      double offsetX = 0, offsetY = 0;
 
-            offsetX = element.X - adorner.X;
-            offsetY = element.Y - adorner.Y;
+      Point adorner = Mouse.GetPosition( this );
+      Point element = Mouse.GetPosition( AdornedElement );
 
-            double left = _currentMousePosition.X - ((_magnifier.ViewBox.Width / 2) + offsetX);
-            double top = _currentMousePosition.Y - ((_magnifier.ViewBox.Height / 2) + offsetY);
-            return new Point(left, top);
-        }
+      offsetX = element.X - adorner.X;
+      offsetY = element.Y - adorner.Y;
 
-        #endregion
+      double left = _currentMousePosition.X - ( ( _magnifier.ViewBox.Width / 2 ) + offsetX );
+      double top = _currentMousePosition.Y - ( ( _magnifier.ViewBox.Height / 2 ) + offsetY );
+      return new Point( left, top );
+    }
 
-        #region Overrides
+    #endregion
 
-        protected override Visual GetVisualChild(int index)
-        {
-            return _magnifier;
-        }
+    #region Overrides
 
-        protected override int VisualChildrenCount
-        {
-            get { return 1; }
-        }
+    protected override Visual GetVisualChild( int index )
+    {
+      return _magnifier;
+    }
 
-        protected override Size MeasureOverride(Size constraint)
-        {
-            _magnifier.Measure(constraint);
-            return base.MeasureOverride(constraint);
-        }
+    protected override int VisualChildrenCount
+    {
+      get
+      {
+        return 1;
+      }
+    }
 
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            double x = _currentMousePosition.X - (_magnifier.DefaultSize.Width / 2);
-            double y = _currentMousePosition.Y - (_magnifier.DefaultSize.Height / 2);
-            _magnifier.Arrange(new Rect(x, y, _magnifier.DefaultSize.Width, _magnifier.DefaultSize.Height));
-            return base.ArrangeOverride(finalSize);
-        }
+    protected override Size MeasureOverride( Size constraint )
+    {
+      _magnifier.Measure( constraint );
+      return base.MeasureOverride( constraint );
+    }
 
-        #endregion
+    protected override Size ArrangeOverride( Size finalSize )
+    {
+      double x = _currentMousePosition.X - ( _magnifier.DefaultSize.Width / 2 );
+      double y = _currentMousePosition.Y - ( _magnifier.DefaultSize.Height / 2 );
+      _magnifier.Arrange( new Rect( x, y, _magnifier.DefaultSize.Width, _magnifier.DefaultSize.Height ) );
+      return base.ArrangeOverride( finalSize );
     }
+
+    #endregion
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs
index eaaa2c7e..1a5e75d9 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Implementation/MagnifierManager.cs
@@ -1,98 +1,116 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 using System.Windows.Documents;
 using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls
 {
-    public class MagnifierManager : DependencyObject
-    {
-        #region Members
+  public class MagnifierManager : DependencyObject
+  {
+    #region Members
 
-        private MagnifierAdorner _adorner;
-        private UIElement _element;
+    private MagnifierAdorner _adorner;
+    private UIElement _element;
 
-        #endregion //Members
+    #endregion //Members
 
-        #region Properties
+    #region Properties
 
-        public static readonly DependencyProperty CurrentProperty = DependencyProperty.RegisterAttached("Magnifier", typeof(Magnifier), typeof(UIElement), new FrameworkPropertyMetadata(null, OnMagnifierChanged));
-        public static void SetMagnifier(UIElement element, Magnifier value)
-        {
-            element.SetValue(CurrentProperty, value);
-        }
-        public static Magnifier GetMagnifier(UIElement element)
-        {
-            return (Magnifier)element.GetValue(CurrentProperty);
-        }
-
-        private static void OnMagnifierChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            UIElement target = d as UIElement;
+    public static readonly DependencyProperty CurrentProperty = DependencyProperty.RegisterAttached( "Magnifier", typeof( Magnifier ), typeof( UIElement ), new FrameworkPropertyMetadata( null, OnMagnifierChanged ) );
+    public static void SetMagnifier( UIElement element, Magnifier value )
+    {
+      element.SetValue( CurrentProperty, value );
+    }
+    public static Magnifier GetMagnifier( UIElement element )
+    {
+      return ( Magnifier )element.GetValue( CurrentProperty );
+    }
 
-            if (target == null)
-                throw new ArgumentException("Magnifier can only be attached to a UIElement.");
+    private static void OnMagnifierChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      UIElement target = d as UIElement;
 
-            MagnifierManager manager = new MagnifierManager();
-            manager.AttachToMagnifier(target, e.NewValue as Magnifier);
-        }
+      if( target == null )
+        throw new ArgumentException( "Magnifier can only be attached to a UIElement." );
 
-        #endregion //Properties
+      MagnifierManager manager = new MagnifierManager();
+      manager.AttachToMagnifier( target, e.NewValue as Magnifier );
+    }
 
-        #region Event Handlers
+    #endregion //Properties
 
-        void Element_MouseLeave(object sender, MouseEventArgs e)
-        {
-            HideAdorner();
-        }
+    #region Event Handlers
 
-        void Element_MouseEnter(object sender, MouseEventArgs e)
-        {
-            ShowAdorner();
-        }
+    void Element_MouseLeave( object sender, MouseEventArgs e )
+    {
+      HideAdorner();
+    }
 
-        #endregion //Event Handlers
+    void Element_MouseEnter( object sender, MouseEventArgs e )
+    {
+      ShowAdorner();
+    }
 
-        #region Methods
+    #endregion //Event Handlers
 
-        private void AttachToMagnifier(UIElement element, Magnifier magnifier)
-        {
-            _element = element;
-            _element.MouseEnter += Element_MouseEnter;
-            _element.MouseLeave += Element_MouseLeave;
+    #region Methods
 
-            magnifier.Target = _element;
+    private void AttachToMagnifier( UIElement element, Magnifier magnifier )
+    {
+      _element = element;
+      _element.MouseEnter += Element_MouseEnter;
+      _element.MouseLeave += Element_MouseLeave;
 
-            _adorner = new MagnifierAdorner(_element, magnifier);
-        }
+      magnifier.Target = _element;
 
-        void ShowAdorner()
-        {
-            VerifyAdornerLayer();
-            _adorner.Visibility = Visibility.Visible;
-        }
+      _adorner = new MagnifierAdorner( _element, magnifier );
+    }
 
-        bool VerifyAdornerLayer()
-        {
-            if (_adorner.Parent != null)
-                return true;
+    void ShowAdorner()
+    {
+      VerifyAdornerLayer();
+      _adorner.Visibility = Visibility.Visible;
+    }
 
-            AdornerLayer layer = AdornerLayer.GetAdornerLayer(_element);
-            if (layer == null)
-                return false;
+    bool VerifyAdornerLayer()
+    {
+      if( _adorner.Parent != null )
+        return true;
 
-            layer.Add(_adorner);
-            return true;
-        }
+      AdornerLayer layer = AdornerLayer.GetAdornerLayer( _element );
+      if( layer == null )
+        return false;
 
-        void HideAdorner()
-        {
-            if (_adorner.Visibility == Visibility.Visible)
-            {
-                _adorner.Visibility = Visibility.Collapsed;
-            }
-        }
+      layer.Add( _adorner );
+      return true;
+    }
 
-        #endregion //Methods
+    void HideAdorner()
+    {
+      if( _adorner.Visibility == Visibility.Visible )
+      {
+        _adorner.Visibility = Visibility.Collapsed;
+      }
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml
index 4e74340d..f7c67b2f 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml
@@ -1,63 +1,82 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:magConverters="clr-namespace:Microsoft.Windows.Controls.Mag.Converters">
 
-    <!-- =============================================================================== -->
-    <!-- Magnifier                                                                       -->
-    <!-- =============================================================================== -->
-
-    <magConverters:RadiusConverter x:Key="RadiusConverter"/>
-    <magConverters:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter"/>
-
-    <ControlTemplate x:Key="CircleTemplate" TargetType="{x:Type local:Magnifier}">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="{Binding Path=Radius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource RadiusConverter}}"/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="{Binding Path=Radius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource RadiusConverter}}"/>
-            </Grid.RowDefinitions>
-            <Ellipse Width="{Binding Path=FrameWidth, RelativeSource={RelativeSource TemplatedParent}}" 
-                     Height="{Binding Path=FrameHeight, RelativeSource={RelativeSource TemplatedParent}}" 
-                     Fill="{TemplateBinding Background}"/>
-            <Ellipse Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}" 
-                     StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
-                <Ellipse.Fill>
-                    <VisualBrush Viewbox="{Binding Path=ViewBox, RelativeSource={RelativeSource TemplatedParent}}" 
-                                 ViewboxUnits="Absolute"
-                                 Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}"/>
-                </Ellipse.Fill>
-            </Ellipse>
-        </Grid>
-    </ControlTemplate>
-
-    <ControlTemplate x:Key="RectangleTemplate" TargetType="{x:Type local:Magnifier}">
-        <Canvas Background="{TemplateBinding Background}"
-                Width="{Binding Path=FrameWidth, RelativeSource={RelativeSource TemplatedParent}}" 
-                Height="{Binding Path=FrameHeight, RelativeSource={RelativeSource TemplatedParent}}">
-            <Rectangle Width="{Binding Path=Width, RelativeSource={RelativeSource TemplatedParent}}" 
-                Height="{Binding Path=Height, RelativeSource={RelativeSource TemplatedParent}}"
-                Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}"
-                StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
-                <Rectangle.Fill>
-                    <VisualBrush Viewbox="{Binding Path=ViewBox, RelativeSource={RelativeSource TemplatedParent}}" ViewboxUnits="Absolute"
-                                 Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}"/>
-                </Rectangle.Fill>
-            </Rectangle>
-        </Canvas>
-    </ControlTemplate>
-
-    <Style TargetType="{x:Type local:Magnifier}">
-        <Setter Property="IsHitTestVisible" Value="False"/>
-        <Style.Triggers>
-            <Trigger Property="FrameType" Value="Circle">
-                <Setter Property="Template" Value="{StaticResource CircleTemplate}"/>
-            </Trigger>
-            <Trigger Property="FrameType" Value="Rectangle">
-                <Setter Property="Template" Value="{StaticResource RectangleTemplate}"/>
-            </Trigger>
-        </Style.Triggers>
-    </Style>
+   <!-- =============================================================================== -->
+   <!-- Magnifier                                                                       -->
+   <!-- =============================================================================== -->
+
+   <magConverters:RadiusConverter x:Key="RadiusConverter" />
+   <magConverters:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter" />
+
+   <ControlTemplate x:Key="CircleTemplate" TargetType="{x:Type local:Magnifier}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="{Binding Path=Radius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource RadiusConverter}}" />
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="{Binding Path=Radius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource RadiusConverter}}" />
+         </Grid.RowDefinitions>
+         <Ellipse Width="{Binding Path=FrameWidth, RelativeSource={RelativeSource TemplatedParent}}" 
+                  Height="{Binding Path=FrameHeight, RelativeSource={RelativeSource TemplatedParent}}" 
+                  Fill="{TemplateBinding Background}" />
+         <Ellipse Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}" 
+                  StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
+            <Ellipse.Fill>
+               <VisualBrush Viewbox="{Binding Path=ViewBox, RelativeSource={RelativeSource TemplatedParent}}" 
+                            ViewboxUnits="Absolute"
+                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}" />
+            </Ellipse.Fill>
+         </Ellipse>
+      </Grid>
+   </ControlTemplate>
+
+   <ControlTemplate x:Key="RectangleTemplate" TargetType="{x:Type local:Magnifier}">
+      <Canvas Background="{TemplateBinding Background}"
+              Width="{Binding Path=FrameWidth, RelativeSource={RelativeSource TemplatedParent}}" 
+              Height="{Binding Path=FrameHeight, RelativeSource={RelativeSource TemplatedParent}}">
+         <Rectangle Width="{Binding Path=Width, RelativeSource={RelativeSource TemplatedParent}}" 
+                    Height="{Binding Path=Height, RelativeSource={RelativeSource TemplatedParent}}"
+                    Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}"
+                    StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
+            <Rectangle.Fill>
+               <VisualBrush Viewbox="{Binding Path=ViewBox, RelativeSource={RelativeSource TemplatedParent}}"
+                            ViewboxUnits="Absolute"
+                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}" />
+            </Rectangle.Fill>
+         </Rectangle>
+      </Canvas>
+   </ControlTemplate>
+
+   <Style TargetType="{x:Type local:Magnifier}">
+      <Setter Property="IsHitTestVisible" Value="False" />
+      <Style.Triggers>
+         <Trigger Property="FrameType" Value="Circle">
+            <Setter Property="Template" Value="{StaticResource CircleTemplate}" />
+         </Trigger>
+         <Trigger Property="FrameType" Value="Rectangle">
+            <Setter Property="Template" Value="{StaticResource RectangleTemplate}" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs
index e6f2517a..de401280 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MaskedTextBox/Implementation/MaskedTextBox.cs
@@ -1,519 +1,589 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.ComponentModel;
 using System.Windows;
-using System.Windows.Input;
 using System.Windows.Controls;
+using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls
 {
-    public class MaskedTextBox : TextBox
-    {
-        #region Members
+  public class MaskedTextBox : TextBox
+  {
+    #region Members
 
-        /// <summary>
-        /// Flags if the Text and Value properties are in the process of being sync'd
-        /// </summary>
-        private bool _isSyncingTextAndValueProperties;
-        private bool _isInitialized;
-        private bool _convertExceptionOccurred = false;
+    /// <summary>
+    /// Flags if the Text and Value properties are in the process of being sync'd
+    /// </summary>
+    private bool _isSyncingTextAndValueProperties;
+    private bool _isInitialized;
+    private bool _convertExceptionOccurred = false;
 
-        #endregion //Members
+    #endregion //Members
 
-        #region Properties
+    #region Properties
 
-        protected MaskedTextProvider MaskProvider { get; set; }
+    protected MaskedTextProvider MaskProvider
+    {
+      get;
+      set;
+    }
 
-        #region IncludePrompt
+    #region IncludePrompt
 
-        public static readonly DependencyProperty IncludePromptProperty = DependencyProperty.Register("IncludePrompt", typeof(bool), typeof(MaskedTextBox), new UIPropertyMetadata(false, OnIncludePromptPropertyChanged));
-        public bool IncludePrompt
-        {
-            get { return (bool)GetValue(IncludePromptProperty); }
-            set { SetValue(IncludePromptProperty, value); }
-        }
+    public static readonly DependencyProperty IncludePromptProperty = DependencyProperty.Register( "IncludePrompt", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( false, OnIncludePromptPropertyChanged ) );
+    public bool IncludePrompt
+    {
+      get
+      {
+        return ( bool )GetValue( IncludePromptProperty );
+      }
+      set
+      {
+        SetValue( IncludePromptProperty, value );
+      }
+    }
 
-        private static void OnIncludePromptPropertyChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            MaskedTextBox maskedTextBox = o as MaskedTextBox;
-            if (maskedTextBox != null)
-                maskedTextBox.OnIncludePromptChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
+    private static void OnIncludePromptPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnIncludePromptChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
 
-        protected virtual void OnIncludePromptChanged(bool oldValue, bool newValue)
-        {
-            ResolveMaskProvider(Mask);
-        }
+    protected virtual void OnIncludePromptChanged( bool oldValue, bool newValue )
+    {
+      ResolveMaskProvider( Mask );
+    }
 
-        #endregion //IncludePrompt
+    #endregion //IncludePrompt
 
-        #region IncludeLiterals
+    #region IncludeLiterals
 
-        public static readonly DependencyProperty IncludeLiteralsProperty = DependencyProperty.Register("IncludeLiterals", typeof(bool), typeof(MaskedTextBox), new UIPropertyMetadata(true, OnIncludeLiteralsPropertyChanged));
-        public bool IncludeLiterals
-        {
-            get { return (bool)GetValue(IncludeLiteralsProperty); }
-            set { SetValue(IncludeLiteralsProperty, value); }
-        }
+    public static readonly DependencyProperty IncludeLiteralsProperty = DependencyProperty.Register( "IncludeLiterals", typeof( bool ), typeof( MaskedTextBox ), new UIPropertyMetadata( true, OnIncludeLiteralsPropertyChanged ) );
+    public bool IncludeLiterals
+    {
+      get
+      {
+        return ( bool )GetValue( IncludeLiteralsProperty );
+      }
+      set
+      {
+        SetValue( IncludeLiteralsProperty, value );
+      }
+    }
 
-        private static void OnIncludeLiteralsPropertyChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            MaskedTextBox maskedTextBox = o as MaskedTextBox;
-            if (maskedTextBox != null)
-                maskedTextBox.OnIncludeLiteralsChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
+    private static void OnIncludeLiteralsPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnIncludeLiteralsChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
 
-        protected virtual void OnIncludeLiteralsChanged(bool oldValue, bool newValue)
-        {
-            ResolveMaskProvider(Mask);
-        }
+    protected virtual void OnIncludeLiteralsChanged( bool oldValue, bool newValue )
+    {
+      ResolveMaskProvider( Mask );
+    }
 
-        #endregion //IncludeLiterals
+    #endregion //IncludeLiterals
 
-        #region Mask
+    #region Mask
 
-        public static readonly DependencyProperty MaskProperty = DependencyProperty.Register("Mask", typeof(string), typeof(MaskedTextBox), new UIPropertyMetadata(default(String), OnMaskPropertyChanged));
-        public string Mask
-        {
-            get { return (string)GetValue(MaskProperty); }
-            set { SetValue(MaskProperty, value); }
-        }
+    public static readonly DependencyProperty MaskProperty = DependencyProperty.Register( "Mask", typeof( string ), typeof( MaskedTextBox ), new UIPropertyMetadata( default( String ), OnMaskPropertyChanged ) );
+    public string Mask
+    {
+      get
+      {
+        return ( string )GetValue( MaskProperty );
+      }
+      set
+      {
+        SetValue( MaskProperty, value );
+      }
+    }
 
-        private static void OnMaskPropertyChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            MaskedTextBox maskedTextBox = o as MaskedTextBox;
-            if (maskedTextBox != null)
-                maskedTextBox.OnMaskChanged((string)e.OldValue, (string)e.NewValue);
-        }
+    private static void OnMaskPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnMaskChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
 
-        protected virtual void OnMaskChanged(string oldValue, string newValue)
-        {
-            ResolveMaskProvider(newValue);
-            UpdateText(MaskProvider, 0);
-        }
+    protected virtual void OnMaskChanged( string oldValue, string newValue )
+    {
+      ResolveMaskProvider( newValue );
+      UpdateText( MaskProvider, 0 );
+    }
 
-        #endregion //Mask
+    #endregion //Mask
 
-        #region PromptChar
+    #region PromptChar
 
-        public static readonly DependencyProperty PromptCharProperty = DependencyProperty.Register("PromptChar", typeof(char), typeof(MaskedTextBox), new UIPropertyMetadata('_', OnPromptCharChanged));
-        public char PromptChar
-        {
-            get { return (char)GetValue(PromptCharProperty); }
-            set { SetValue(PromptCharProperty, value); }
-        }
+    public static readonly DependencyProperty PromptCharProperty = DependencyProperty.Register( "PromptChar", typeof( char ), typeof( MaskedTextBox ), new UIPropertyMetadata( '_', OnPromptCharChanged ) );
+    public char PromptChar
+    {
+      get
+      {
+        return ( char )GetValue( PromptCharProperty );
+      }
+      set
+      {
+        SetValue( PromptCharProperty, value );
+      }
+    }
 
-        private static void OnPromptCharChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            MaskedTextBox maskedTextBox = o as MaskedTextBox;
-            if (maskedTextBox != null)
-                maskedTextBox.OnPromptCharChanged((char)e.OldValue, (char)e.NewValue);
-        }
+    private static void OnPromptCharChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnPromptCharChanged( ( char )e.OldValue, ( char )e.NewValue );
+    }
 
-        protected virtual void OnPromptCharChanged(char oldValue, char newValue)
-        {
-            ResolveMaskProvider(Mask);
-        }
+    protected virtual void OnPromptCharChanged( char oldValue, char newValue )
+    {
+      ResolveMaskProvider( Mask );
+    }
 
-        #endregion //PromptChar
+    #endregion //PromptChar
 
-        #region SelectAllOnGotFocus
+    #region SelectAllOnGotFocus
 
-        public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register("SelectAllOnGotFocus", typeof(bool), typeof(MaskedTextBox), new PropertyMetadata(false));
-        public bool SelectAllOnGotFocus
-        {
-            get { return (bool)GetValue(SelectAllOnGotFocusProperty); }
-            set { SetValue(SelectAllOnGotFocusProperty, value); }
-        }
+    public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register( "SelectAllOnGotFocus", typeof( bool ), typeof( MaskedTextBox ), new PropertyMetadata( false ) );
+    public bool SelectAllOnGotFocus
+    {
+      get
+      {
+        return ( bool )GetValue( SelectAllOnGotFocusProperty );
+      }
+      set
+      {
+        SetValue( SelectAllOnGotFocusProperty, value );
+      }
+    }
 
-        #endregion //SelectAllOnGotFocus
+    #endregion //SelectAllOnGotFocus
 
-        #region Text
+    #region Text
 
-        private static void OnTextChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            MaskedTextBox inputBase = o as MaskedTextBox;
-            if (inputBase != null)
-                inputBase.OnTextChanged((string)e.OldValue, (string)e.NewValue);
-        }
+    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox inputBase = o as MaskedTextBox;
+      if( inputBase != null )
+        inputBase.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
 
-        protected virtual void OnTextChanged(string oldValue, string newValue)
-        {
-            if (_isInitialized)
-                SyncTextAndValueProperties(MaskedTextBox.TextProperty, newValue);
-        }
+    protected virtual void OnTextChanged( string oldValue, string newValue )
+    {
+      if( _isInitialized )
+        SyncTextAndValueProperties( MaskedTextBox.TextProperty, newValue );
+    }
 
-        #endregion //Text
+    #endregion //Text
 
-        #region Value
+    #region Value
 
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register("Value", typeof(object), typeof(MaskedTextBox), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged));
-        public object Value
-        {
-            get { return (object)GetValue(ValueProperty); }
-            set { SetValue(ValueProperty, value); }
-        }
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( MaskedTextBox ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
+    public object Value
+    {
+      get
+      {
+        return ( object )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
 
-        private static void OnValueChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            MaskedTextBox maskedTextBox = o as MaskedTextBox;
-            if (maskedTextBox != null)
-                maskedTextBox.OnValueChanged((object)e.OldValue, (object)e.NewValue);
-        }
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnValueChanged( ( object )e.OldValue, ( object )e.NewValue );
+    }
 
-        protected virtual void OnValueChanged(object oldValue, object newValue)
-        {
-            if (_isInitialized)
-                SyncTextAndValueProperties(MaskedTextBox.ValueProperty, newValue);
+    protected virtual void OnValueChanged( object oldValue, object newValue )
+    {
+      if( _isInitialized )
+        SyncTextAndValueProperties( MaskedTextBox.ValueProperty, newValue );
 
-            RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>(oldValue, newValue);
-            args.RoutedEvent = MaskedTextBox.ValueChangedEvent;
-            RaiseEvent(args);
-        }
+      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
+      args.RoutedEvent = MaskedTextBox.ValueChangedEvent;
+      RaiseEvent( args );
+    }
 
-        #endregion //Value
+    #endregion //Value
 
-        #region ValueType
+    #region ValueType
 
-        public static readonly DependencyProperty ValueTypeProperty = DependencyProperty.Register("ValueType", typeof(Type), typeof(MaskedTextBox), new UIPropertyMetadata(typeof(String), OnValueTypeChanged));
-        public Type ValueType
-        {
-            get { return (Type)GetValue(ValueTypeProperty); }
-            set { SetValue(ValueTypeProperty, value); }
-        }
+    public static readonly DependencyProperty ValueTypeProperty = DependencyProperty.Register( "ValueType", typeof( Type ), typeof( MaskedTextBox ), new UIPropertyMetadata( typeof( String ), OnValueTypeChanged ) );
+    public Type ValueType
+    {
+      get
+      {
+        return ( Type )GetValue( ValueTypeProperty );
+      }
+      set
+      {
+        SetValue( ValueTypeProperty, value );
+      }
+    }
 
-        private static void OnValueTypeChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            MaskedTextBox maskedTextBox = o as MaskedTextBox;
-            if (maskedTextBox != null)
-                maskedTextBox.OnValueTypeChanged((Type)e.OldValue, (Type)e.NewValue);
-        }
+    private static void OnValueTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MaskedTextBox maskedTextBox = o as MaskedTextBox;
+      if( maskedTextBox != null )
+        maskedTextBox.OnValueTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
+    }
 
-        protected virtual void OnValueTypeChanged(Type oldValue, Type newValue)
-        {
-            if (_isInitialized)
-                SyncTextAndValueProperties(MaskedTextBox.TextProperty, Text);
-        }
+    protected virtual void OnValueTypeChanged( Type oldValue, Type newValue )
+    {
+      if( _isInitialized )
+        SyncTextAndValueProperties( MaskedTextBox.TextProperty, Text );
+    }
 
-        #endregion //ValueType
+    #endregion //ValueType
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region Constructors
+    #region Constructors
 
-        static MaskedTextBox()
-        {
-            TextProperty.OverrideMetadata(typeof(MaskedTextBox), new FrameworkPropertyMetadata(OnTextChanged));
-        }
+    static MaskedTextBox()
+    {
+      TextProperty.OverrideMetadata( typeof( MaskedTextBox ), new FrameworkPropertyMetadata( OnTextChanged ) );
+    }
 
-        public MaskedTextBox()
-        {
-            PreviewTextInput += TextBox_PreviewTextInput;
-            PreviewKeyDown += TextBox_PreviewKeyDown;
+    public MaskedTextBox()
+    {
+      PreviewTextInput += TextBox_PreviewTextInput;
+      PreviewKeyDown += TextBox_PreviewKeyDown;
 
-            CommandBindings.Add(new CommandBinding(ApplicationCommands.Paste, Paste)); //handle paste
-            CommandBindings.Add(new CommandBinding(ApplicationCommands.Cut, null, CanCut)); //surpress cut
-        }
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.Paste, Paste ) ); //handle paste
+      CommandBindings.Add( new CommandBinding( ApplicationCommands.Cut, null, CanCut ) ); //surpress cut
+    }
 
-        #endregion //Constructors
+    #endregion //Constructors
 
-        #region Base Class Overrides
+    #region Base Class Overrides
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-            UpdateText(MaskProvider, 0);
-        }
+      UpdateText( MaskProvider, 0 );
+    }
 
-        protected override void OnInitialized(EventArgs e)
-        {
-            base.OnInitialized(e);
+    protected override void OnInitialized( EventArgs e )
+    {
+      base.OnInitialized( e );
 
-            if (!_isInitialized)
-            {
-                _isInitialized = true;
-                SyncTextAndValueProperties(ValueProperty, Value);
-            }
-        }
+      if( !_isInitialized )
+      {
+        _isInitialized = true;
+        SyncTextAndValueProperties( ValueProperty, Value );
+      }
+    }
 
-        protected override void OnGotKeyboardFocus(KeyboardFocusChangedEventArgs e)
-        {
-            if (SelectAllOnGotFocus)
-                SelectAll();
+    protected override void OnGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
+    {
+      if( SelectAllOnGotFocus )
+        SelectAll();
 
-            base.OnGotKeyboardFocus(e);
-        }
+      base.OnGotKeyboardFocus( e );
+    }
 
-        protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
-        {
-            if (!IsKeyboardFocused)
-            {
-                e.Handled = true;
-                Focus();
-            }
+    protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
+    {
+      if( !IsKeyboardFocused )
+      {
+        e.Handled = true;
+        Focus();
+      }
 
-            base.OnPreviewMouseLeftButtonDown(e);
-        }
+      base.OnPreviewMouseLeftButtonDown( e );
+    }
 
-        #endregion //Base Class Overrides
+    #endregion //Base Class Overrides
 
-        #region Event Handlers
+    #region Event Handlers
 
-        void TextBox_PreviewTextInput(object sender, TextCompositionEventArgs e)
+    void TextBox_PreviewTextInput( object sender, TextCompositionEventArgs e )
+    {
+      //if the text is readonly do not add the text
+      if( IsReadOnly )
+      {
+        e.Handled = true;
+        return;
+      }
+
+      int position = SelectionStart;
+      MaskedTextProvider provider = MaskProvider;
+
+      if( position < Text.Length )
+      {
+        position = GetNextCharacterPosition( position );
+
+        if( Keyboard.IsKeyToggled( Key.Insert ) )
         {
-            //if the text is readonly do not add the text
-            if (IsReadOnly)
-            {
-                e.Handled = true;
-                return;
-            }
-
-            int position = SelectionStart;
-            MaskedTextProvider provider = MaskProvider;
-
-            if (position < Text.Length)
-            {
-                position = GetNextCharacterPosition(position);
-
-                if (Keyboard.IsKeyToggled(Key.Insert))
-                {
-                    if (provider.Replace(e.Text, position))
-                        position++;
-                }
-                else
-                {
-                    if (provider.InsertAt(e.Text, position))
-                        position++;
-                }
-
-                position = GetNextCharacterPosition(position);
-            }
-
-            UpdateText(provider, position);
-            e.Handled = true;
-
-            base.OnPreviewTextInput(e);
+          if( provider.Replace( e.Text, position ) )
+            position++;
         }
-
-        void TextBox_PreviewKeyDown(object sender, KeyEventArgs e)
+        else
         {
-            if (IsReadOnly)
-                return;
-
-            MaskedTextProvider provider = MaskProvider;
-            int position = SelectionStart;
-            int selectionlength = SelectionLength;
-            // If no selection use the start position else use end position
-            int endposition = (selectionlength == 0) ? position : position + selectionlength - 1;
-
-            if (e.Key == Key.Delete && position < Text.Length)//handle the delete key
-            {
-                if (provider.RemoveAt(position, endposition))
-                    UpdateText(provider, position);
-
-                e.Handled = true;
-            }
-            else if (e.Key == Key.Space)
-            {
-                if (provider.InsertAt(" ", position))
-                    UpdateText(provider, ++position);
-                e.Handled = true;
-            }
-            else if (e.Key == Key.Back)//handle the back space
-            {
-                if ((position > 0) && (selectionlength == 0))
-                {
-                    position--;
-                    if (provider.RemoveAt(position))
-                        UpdateText(provider, position);
-                }
-
-                if (selectionlength != 0)
-                {
-                    if (provider.RemoveAt(position, endposition))
-                    {
-                        if (position > 0)
-                            position--;
-
-                        UpdateText(provider, position);
-                    }
-                }
-
-                e.Handled = true;
-            }
-
-            //if all text is selected and the user begins to type, we want to delete all selected text and continue typing the new values
-            //but only if the user is not tabbing / shift tabbing or copying/pasting
-            if (SelectionLength == Text.Length && (e.Key != Key.Tab && e.Key != Key.LeftShift && e.Key != Key.RightShift && e.Key != Key.Left && e.Key != Key.Right && e.Key != Key.Up && e.Key != Key.Down &&
-                                                   (Keyboard.Modifiers & ModifierKeys.Control) != ModifierKeys.Control))
-            {
-                if (provider.RemoveAt(position, endposition))
-                    UpdateText(provider, position);
-            }
-
-            base.OnPreviewKeyDown(e);
+          if( provider.InsertAt( e.Text, position ) )
+            position++;
         }
 
-        #endregion //Event Handlers
+        position = GetNextCharacterPosition( position );
+      }
 
-        #region Events
+      UpdateText( provider, position );
+      e.Handled = true;
 
-        public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble, typeof(RoutedPropertyChangedEventHandler<object>), typeof(MaskedTextBox));
-        public event RoutedPropertyChangedEventHandler<object> ValueChanged
-        {
-            add { AddHandler(ValueChangedEvent, value); }
-            remove { RemoveHandler(ValueChangedEvent, value); }
-        }
+      base.OnPreviewTextInput( e );
+    }
 
-        #endregion //Events
+    void TextBox_PreviewKeyDown( object sender, KeyEventArgs e )
+    {
+      if( IsReadOnly )
+        return;
+
+      MaskedTextProvider provider = MaskProvider;
+      int position = SelectionStart;
+      int selectionlength = SelectionLength;
+      // If no selection use the start position else use end position
+      int endposition = ( selectionlength == 0 ) ? position : position + selectionlength - 1;
+
+      if( e.Key == Key.Delete && position < Text.Length )//handle the delete key
+      {
+        if( provider.RemoveAt( position, endposition ) )
+          UpdateText( provider, position );
+
+        e.Handled = true;
+      }
+      else if( e.Key == Key.Space )
+      {
+        if( provider.InsertAt( " ", position ) )
+          UpdateText( provider, ++position );
+        e.Handled = true;
+      }
+      else if( e.Key == Key.Back )//handle the back space
+      {
+        if( ( position > 0 ) && ( selectionlength == 0 ) )
+        {
+          position--;
+          if( provider.RemoveAt( position ) )
+            UpdateText( provider, position );
+        }
+
+        if( selectionlength != 0 )
+        {
+          if( provider.RemoveAt( position, endposition ) )
+          {
+            if( position > 0 )
+              position--;
+
+            UpdateText( provider, position );
+          }
+        }
+
+        e.Handled = true;
+      }
+
+      //if all text is selected and the user begins to type, we want to delete all selected text and continue typing the new values
+      //but only if the user is not tabbing / shift tabbing or copying/pasting
+      if( SelectionLength == Text.Length && ( e.Key != Key.Tab && e.Key != Key.LeftShift && e.Key != Key.RightShift && e.Key != Key.Left && e.Key != Key.Right && e.Key != Key.Up && e.Key != Key.Down &&
+                                             ( Keyboard.Modifiers & ModifierKeys.Control ) != ModifierKeys.Control ) )
+      {
+        if( provider.RemoveAt( position, endposition ) )
+          UpdateText( provider, position );
+      }
+
+      base.OnPreviewKeyDown( e );
+    }
 
-        #region Methods
+    #endregion //Event Handlers
 
-        #region Private
+    #region Events
 
-        private void UpdateText(MaskedTextProvider provider, int position)
-        {
-            if (provider == null)
-                throw new ArgumentNullException("MaskedTextProvider", "Mask cannot be null.");
+    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( MaskedTextBox ) );
+    public event RoutedPropertyChangedEventHandler<object> ValueChanged
+    {
+      add
+      {
+        AddHandler( ValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ValueChangedEvent, value );
+      }
+    }
 
-            Text = provider.ToDisplayString();
+    #endregion //Events
 
-            SelectionStart = position;
-        }
+    #region Methods
 
-        private int GetNextCharacterPosition(int startPosition)
-        {
-            int position = MaskProvider.FindEditPositionFrom(startPosition, true);
-            return position == -1 ? startPosition : position;
-        }
+    #region Private
 
-        private void ResolveMaskProvider(string mask)
-        {
-            //do not create a mask provider if the Mask is empty, which can occur if the IncludePrompt and IncludeLiterals properties
-            //are set prior to the Mask.
-            if (String.IsNullOrEmpty(mask))
-                return;
-
-            MaskProvider = new MaskedTextProvider(mask)
-            {
-                IncludePrompt = this.IncludePrompt,
-                IncludeLiterals = this.IncludeLiterals,
-                PromptChar = this.PromptChar,
-                ResetOnSpace = false //should make this a property
-            };
-        }
+    private void UpdateText( MaskedTextProvider provider, int position )
+    {
+      if( provider == null )
+        throw new ArgumentNullException( "MaskedTextProvider", "Mask cannot be null." );
 
-        private object ConvertTextToValue(string text)
-        {
-            object convertedValue = null;
+      Text = provider.ToDisplayString();
+
+      SelectionStart = position;
+    }
 
-            Type dataType = ValueType;
+    private int GetNextCharacterPosition( int startPosition )
+    {
+      int position = MaskProvider.FindEditPositionFrom( startPosition, true );
+      return position == -1 ? startPosition : position;
+    }
+
+    private void ResolveMaskProvider( string mask )
+    {
+      //do not create a mask provider if the Mask is empty, which can occur if the IncludePrompt and IncludeLiterals properties
+      //are set prior to the Mask.
+      if( String.IsNullOrEmpty( mask ) )
+        return;
+
+      MaskProvider = new MaskedTextProvider( mask )
+      {
+        IncludePrompt = this.IncludePrompt,
+        IncludeLiterals = this.IncludeLiterals,
+        PromptChar = this.PromptChar,
+        ResetOnSpace = false //should make this a property
+      };
+    }
 
-            string valueToConvert = MaskProvider.ToString().Trim();
+    private object ConvertTextToValue( string text )
+    {
+      object convertedValue = null;
 
-            try
-            {
-                if (valueToConvert.GetType() == dataType || dataType.IsInstanceOfType(valueToConvert))
-                {
-                    convertedValue = valueToConvert;
-                }
+      Type dataType = ValueType;
+
+      string valueToConvert = MaskProvider.ToString().Trim();
+
+      try
+      {
+        if( valueToConvert.GetType() == dataType || dataType.IsInstanceOfType( valueToConvert ) )
+        {
+          convertedValue = valueToConvert;
+        }
 #if !VS2008
-                else if (String.IsNullOrWhiteSpace(valueToConvert))
-                {
-                    convertedValue = Activator.CreateInstance(dataType);
-                }
+        else if( String.IsNullOrWhiteSpace( valueToConvert ) )
+        {
+          convertedValue = Activator.CreateInstance( dataType );
+        }
 #else
-            else if (String.IsNullOrEmpty(valueToConvert))
-            {
-                convertedValue = Activator.CreateInstance(dataType);
-            }
+        else if ( String.IsNullOrEmpty( valueToConvert ) )
+        {
+          convertedValue = Activator.CreateInstance( dataType );
+        }
 #endif
-                else if (null == convertedValue && valueToConvert is IConvertible)
-                {
-                    convertedValue = Convert.ChangeType(valueToConvert, dataType);
-                }
-            }
-            catch
-            {
-                //if an excpetion occurs revert back to original value
-                _convertExceptionOccurred = true;
-                return Value;
-            }
-
-            return convertedValue;
+        else if( null == convertedValue && valueToConvert is IConvertible )
+        {
+          convertedValue = Convert.ChangeType( valueToConvert, dataType );
         }
+      }
+      catch
+      {
+        //if an excpetion occurs revert back to original value
+        _convertExceptionOccurred = true;
+        return Value;
+      }
 
-        private string ConvertValueToText(object value)
-        {
-            if (value == null)
-                value = string.Empty;
+      return convertedValue;
+    }
 
-            if (_convertExceptionOccurred)
-            {
-                value = Value;
-                _convertExceptionOccurred = false;
-            }
+    private string ConvertValueToText( object value )
+    {
+      if( value == null )
+        value = string.Empty;
 
-            //I have only seen this occur while in Blend, but we need it here so the Blend designer doesn't crash.
-            if (MaskProvider == null)
-                return value.ToString();
+      if( _convertExceptionOccurred )
+      {
+        value = Value;
+        _convertExceptionOccurred = false;
+      }
 
-            MaskProvider.Set(value.ToString());
-            return MaskProvider.ToDisplayString();
-        }
+      //I have only seen this occur while in Blend, but we need it here so the Blend designer doesn't crash.
+      if( MaskProvider == null )
+        return value.ToString();
 
-        private void SyncTextAndValueProperties(DependencyProperty p, object newValue)
-        {
-            //prevents recursive syncing properties
-            if (_isSyncingTextAndValueProperties)
-                return;
+      MaskProvider.Set( value.ToString() );
+      return MaskProvider.ToDisplayString();
+    }
 
-            _isSyncingTextAndValueProperties = true;
+    private void SyncTextAndValueProperties( DependencyProperty p, object newValue )
+    {
+      //prevents recursive syncing properties
+      if( _isSyncingTextAndValueProperties )
+        return;
 
-            //this only occures when the user typed in the value
-            if (MaskedTextBox.TextProperty == p)
-            {
-                if (newValue != null)
-                    SetValue(MaskedTextBox.ValueProperty, ConvertTextToValue(newValue.ToString()));
-            }
+      _isSyncingTextAndValueProperties = true;
 
-            SetValue(MaskedTextBox.TextProperty, ConvertValueToText(newValue));
+      //this only occures when the user typed in the value
+      if( MaskedTextBox.TextProperty == p )
+      {
+        if( newValue != null )
+          SetValue( MaskedTextBox.ValueProperty, ConvertTextToValue( newValue.ToString() ) );
+      }
 
-            _isSyncingTextAndValueProperties = false;
-        }
+      SetValue( MaskedTextBox.TextProperty, ConvertValueToText( newValue ) );
 
-        #endregion //Private
+      _isSyncingTextAndValueProperties = false;
+    }
 
-        #endregion //Methods
+    #endregion //Private
 
-        #region Commands
+    #endregion //Methods
 
-        private void Paste(object sender, RoutedEventArgs e)
-        {
-            if (IsReadOnly)
-                return;
-
-            MaskedTextProvider provider = MaskProvider;
-            int position = SelectionStart;
-
-            object data = Clipboard.GetData(DataFormats.Text);
-            if (data != null)
-            {
-                string text = data.ToString().Trim();
-                if (text.Length > 0)
-                {
-                    provider.Set(text);
-                    UpdateText(provider, position);
-                }
-            }
-        }
+    #region Commands
+
+    private void Paste( object sender, RoutedEventArgs e )
+    {
+      if( IsReadOnly )
+        return;
+
+      MaskedTextProvider provider = MaskProvider;
+      int position = SelectionStart;
 
-        private void CanCut(object sender, CanExecuteRoutedEventArgs e)
+      object data = Clipboard.GetData( DataFormats.Text );
+      if( data != null )
+      {
+        string text = data.ToString().Trim();
+        if( text.Length > 0 )
         {
-            e.CanExecute = false;
-            e.Handled = true;
+          provider.Set( text );
+          UpdateText( provider, position );
         }
+      }
+    }
 
-        #endregion //Commands
+    private void CanCut( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = false;
+      e.Handled = true;
     }
+
+    #endregion //Commands
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs
index 56f70010..e1f05c26 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/MessageBox.cs
@@ -1,561 +1,659 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using System.Windows.Controls.Primitives;
+/************************************************************************
 
-namespace Microsoft.Windows.Controls
-{
-    [TemplateVisualState(Name = VisualStates.OK, GroupName = VisualStates.MessageBoxButtonsGroup)]
-    [TemplateVisualState(Name = VisualStates.OKCancel, GroupName = VisualStates.MessageBoxButtonsGroup)]
-    [TemplateVisualState(Name = VisualStates.YesNo, GroupName = VisualStates.MessageBoxButtonsGroup)]
-    [TemplateVisualState(Name = VisualStates.YesNoCancel, GroupName = VisualStates.MessageBoxButtonsGroup)]
-    public class MessageBox : Control
-    {
-        #region Private Members
-
-        /// <summary>
-        /// Tracks the MessageBoxButon value passed into the InitializeContainer method
-        /// </summary>
-        private MessageBoxButton _button = MessageBoxButton.OK;
+   Extended WPF Toolkit
 
-        /// <summary>
-        /// Tracks the MessageBoxResult to set as the default and focused button
-        /// </summary>
-        private MessageBoxResult _defaultResult = MessageBoxResult.None;
+   Copyright (C) 2010-2012 Xceed Software Inc.
 
-        /// <summary>
-        /// Tracks the owner of the MessageBox
-        /// </summary>
-        private Window _owner;
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
 
-        #endregion //Private Members
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
 
-        #region Constructors
+   Visit http://xceed.com and follow @datagrid on Twitter.
 
-        static MessageBox()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(MessageBox), new FrameworkPropertyMetadata(typeof(MessageBox)));
-        }
+  **********************************************************************/
+using System;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
 
-        internal MessageBox()
-        { 
-            /*user cannot create instance */
-            AddHandler(ButtonBase.ClickEvent, new RoutedEventHandler(Button_Click));
-        }
+namespace Microsoft.Windows.Controls
+{
+  [TemplateVisualState( Name = VisualStates.OK, GroupName = VisualStates.MessageBoxButtonsGroup )]
+  [TemplateVisualState( Name = VisualStates.OKCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
+  [TemplateVisualState( Name = VisualStates.YesNo, GroupName = VisualStates.MessageBoxButtonsGroup )]
+  [TemplateVisualState( Name = VisualStates.YesNoCancel, GroupName = VisualStates.MessageBoxButtonsGroup )]
+  public class MessageBox : Control
+  {
+    #region Private Members
+
+    /// <summary>
+    /// Tracks the MessageBoxButon value passed into the InitializeContainer method
+    /// </summary>
+    private MessageBoxButton _button = MessageBoxButton.OK;
+
+    /// <summary>
+    /// Tracks the MessageBoxResult to set as the default and focused button
+    /// </summary>
+    private MessageBoxResult _defaultResult = MessageBoxResult.None;
+
+    /// <summary>
+    /// Tracks the owner of the MessageBox
+    /// </summary>
+    private Window _owner;
+
+    #endregion //Private Members
+
+    #region Constructors
+
+    static MessageBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( MessageBox ), new FrameworkPropertyMetadata( typeof( MessageBox ) ) );
+    }
 
-        #endregion //Constructors
+    internal MessageBox()
+    {
+      /*user cannot create instance */
+      AddHandler( ButtonBase.ClickEvent, new RoutedEventHandler( Button_Click ) );
+    }
 
-        #region Properties
+    #endregion //Constructors
 
-        #region Protected Properties
+    #region Properties
 
-        /// <summary>
-        /// A System.Windows.MessageBoxResult value that specifies which message box button was clicked by the user.
-        /// </summary>
-        protected MessageBoxResult MessageBoxResult = MessageBoxResult.None;
+    #region Protected Properties
 
-        protected Window Container { get; private set; }
-        protected Thumb DragWidget { get; private set; }
+    /// <summary>
+    /// A System.Windows.MessageBoxResult value that specifies which message box button was clicked by the user.
+    /// </summary>
+    protected MessageBoxResult MessageBoxResult = MessageBoxResult.None;
 
-        #endregion //Protected Properties
+    protected Window Container
+    {
+      get;
+      private set;
+    }
+    protected Thumb DragWidget
+    {
+      get;
+      private set;
+    }
 
-        #region Dependency Properties
+    #endregion //Protected Properties
 
-        public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register("Caption", typeof(string), typeof(MessageBox), new UIPropertyMetadata(String.Empty));
-        public string Caption
-        {
-            get { return (string)GetValue(CaptionProperty); }
-            set { SetValue(CaptionProperty, value); }
-        }
+    #region Dependency Properties
 
-        public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register("CaptionForeground", typeof(Brush), typeof(MessageBox), new UIPropertyMetadata(null));
-        public Brush CaptionForeground
-        {
-            get { return (Brush)GetValue(CaptionForegroundProperty); }
-            set { SetValue(CaptionForegroundProperty, value); }
-        }
+    public static readonly DependencyProperty CaptionProperty = DependencyProperty.Register( "Caption", typeof( string ), typeof( MessageBox ), new UIPropertyMetadata( String.Empty ) );
+    public string Caption
+    {
+      get
+      {
+        return ( string )GetValue( CaptionProperty );
+      }
+      set
+      {
+        SetValue( CaptionProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register("CancelButtonContent", typeof(object), typeof(MessageBox), new UIPropertyMetadata("Cancel"));
-        public object CancelButtonContent
-        {
-            get { return (object)GetValue(CancelButtonContentProperty); }
-            set { SetValue(CancelButtonContentProperty, value); }
-        }
+    public static readonly DependencyProperty CaptionForegroundProperty = DependencyProperty.Register( "CaptionForeground", typeof( Brush ), typeof( MessageBox ), new UIPropertyMetadata( null ) );
+    public Brush CaptionForeground
+    {
+      get
+      {
+        return ( Brush )GetValue( CaptionForegroundProperty );
+      }
+      set
+      {
+        SetValue( CaptionForegroundProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register("CloseButtonStyle", typeof(Style), typeof(MessageBox), new PropertyMetadata(null));
-        public Style CloseButtonStyle
-        {
-            get { return (Style)GetValue(CloseButtonStyleProperty); }
-            set { SetValue(CloseButtonStyleProperty, value); }
-        }
+    public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register( "CancelButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Cancel" ) );
+    public object CancelButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( CancelButtonContentProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonContentProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register("ImageSource", typeof(ImageSource), typeof(MessageBox), new UIPropertyMetadata(default(ImageSource)));
-        public ImageSource ImageSource
-        {
-            get { return (ImageSource)GetValue(ImageSourceProperty); }
-            set { SetValue(ImageSourceProperty, value); }
-        }
+    public static readonly DependencyProperty CloseButtonStyleProperty = DependencyProperty.Register( "CloseButtonStyle", typeof( Style ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Style CloseButtonStyle
+    {
+      get
+      {
+        return ( Style )GetValue( CloseButtonStyleProperty );
+      }
+      set
+      {
+        SetValue( CloseButtonStyleProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty NoButtonContentProperty = DependencyProperty.Register("NoButtonContent", typeof(object), typeof(MessageBox), new UIPropertyMetadata("No"));
-        public object NoButtonContent
-        {
-            get { return (object)GetValue(NoButtonContentProperty); }
-            set { SetValue(NoButtonContentProperty, value); }
-        }
+    public static readonly DependencyProperty ImageSourceProperty = DependencyProperty.Register( "ImageSource", typeof( ImageSource ), typeof( MessageBox ), new UIPropertyMetadata( default( ImageSource ) ) );
+    public ImageSource ImageSource
+    {
+      get
+      {
+        return ( ImageSource )GetValue( ImageSourceProperty );
+      }
+      set
+      {
+        SetValue( ImageSourceProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty OkButtonContentProperty = DependencyProperty.Register("OkButtonContent", typeof(object), typeof(MessageBox), new UIPropertyMetadata("OK"));
-        public object OkButtonContent
-        {
-            get { return (object)GetValue(OkButtonContentProperty); }
-            set { SetValue(OkButtonContentProperty, value); }
-        }
+    public static readonly DependencyProperty NoButtonContentProperty = DependencyProperty.Register( "NoButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "No" ) );
+    public object NoButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( NoButtonContentProperty );
+      }
+      set
+      {
+        SetValue( NoButtonContentProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(MessageBox), new UIPropertyMetadata(String.Empty));
-        public string Text
-        {
-            get { return (string)GetValue(TextProperty); }
-            set { SetValue(TextProperty, value); }
-        }
+    public static readonly DependencyProperty OkButtonContentProperty = DependencyProperty.Register( "OkButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "OK" ) );
+    public object OkButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( OkButtonContentProperty );
+      }
+      set
+      {
+        SetValue( OkButtonContentProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register("WindowBackground", typeof(Brush), typeof(MessageBox), new PropertyMetadata(null));
-        public Brush WindowBackground
-        {
-            get { return (Brush)GetValue(WindowBackgroundProperty); }
-            set { SetValue(WindowBackgroundProperty, value); }
-        }
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( MessageBox ), new UIPropertyMetadata( String.Empty ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register("WindowBorderBrush", typeof(Brush), typeof(MessageBox), new PropertyMetadata(null));
-        public Brush WindowBorderBrush
-        {
-            get { return (Brush)GetValue(WindowBorderBrushProperty); }
-            set { SetValue(WindowBorderBrushProperty, value); }
-        }
+    public static readonly DependencyProperty WindowBackgroundProperty = DependencyProperty.Register( "WindowBackground", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Brush WindowBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBackgroundProperty );
+      }
+      set
+      {
+        SetValue( WindowBackgroundProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register("WindowOpacity", typeof(double), typeof(MessageBox), new PropertyMetadata(null));
-        public double WindowOpacity
-        {
-            get { return (double)GetValue(WindowOpacityProperty); }
-            set { SetValue(WindowOpacityProperty, value); }
-        }
+    public static readonly DependencyProperty WindowBorderBrushProperty = DependencyProperty.Register( "WindowBorderBrush", typeof( Brush ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public Brush WindowBorderBrush
+    {
+      get
+      {
+        return ( Brush )GetValue( WindowBorderBrushProperty );
+      }
+      set
+      {
+        SetValue( WindowBorderBrushProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty YesButtonContentProperty = DependencyProperty.Register("YesButtonContent", typeof(object), typeof(MessageBox), new UIPropertyMetadata("Yes"));
-        public object YesButtonContent
-        {
-            get { return (object)GetValue(YesButtonContentProperty); }
-            set { SetValue(YesButtonContentProperty, value); }
-        }
+    public static readonly DependencyProperty WindowOpacityProperty = DependencyProperty.Register( "WindowOpacity", typeof( double ), typeof( MessageBox ), new PropertyMetadata( null ) );
+    public double WindowOpacity
+    {
+      get
+      {
+        return ( double )GetValue( WindowOpacityProperty );
+      }
+      set
+      {
+        SetValue( WindowOpacityProperty, value );
+      }
+    }
 
-        #endregion //Dependency Properties
+    public static readonly DependencyProperty YesButtonContentProperty = DependencyProperty.Register( "YesButtonContent", typeof( object ), typeof( MessageBox ), new UIPropertyMetadata( "Yes" ) );
+    public object YesButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( YesButtonContentProperty );
+      }
+      set
+      {
+        SetValue( YesButtonContentProperty, value );
+      }
+    }
 
-        #endregion //Properties
+    #endregion //Dependency Properties
 
-        #region Base Class Overrides
+    #endregion //Properties
 
-        /// <summary>
-        /// Overrides the OnApplyTemplate method.
-        /// </summary>
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+    #region Base Class Overrides
 
-            if (DragWidget != null)
-                DragWidget.DragDelta -= (o, e) => ProcessMove(e);
+    /// <summary>
+    /// Overrides the OnApplyTemplate method.
+    /// </summary>
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-            DragWidget = GetTemplateChild("PART_DragWidget") as Thumb;
+      if( DragWidget != null )
+        DragWidget.DragDelta -= ( o, e ) => ProcessMove( e );
 
-            if (DragWidget != null)
-                DragWidget.DragDelta += (o, e) => ProcessMove(e);
+      DragWidget = GetTemplateChild( "PART_DragWidget" ) as Thumb;
 
-            ChangeVisualState(_button.ToString(), true);
+      if( DragWidget != null )
+        DragWidget.DragDelta += ( o, e ) => ProcessMove( e );
 
-            SetDefaultResult();
-        }
+      ChangeVisualState( _button.ToString(), true );
 
-        #endregion //Base Class Overrides
+      SetDefaultResult();
+    }
 
-        #region Methods
+    #endregion //Base Class Overrides
 
-        #region Public Static
+    #region Methods
 
-        /// <summary>
-        /// Displays a message box that has a message and that returns a result.
-        /// </summary>
-        /// <param name="messageText">A System.String that specifies the text to display.</param>
-        /// <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);
-        }
+    #region Public Static
 
-        /// <summary>
-        /// Displays a message box that has a message and that returns a result.
-        /// </summary>
-        /// <param name="owner">A System.Windows.Window that represents the owner of the MessageBox</param>
-        /// <param name="messageText">A System.String that specifies the text to display.</param>
-        /// <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);
-        }
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <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 );
+    }
 
-        /// <summary>
-        /// Displays a message box that has a message and title bar caption; and that returns a result.
-        /// </summary>
-        /// <param name="messageText">A System.String that specifies the text to display.</param>
-        /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-        /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-        public static MessageBoxResult Show(string messageText, string caption)
-        {
-            return Show(messageText, caption, MessageBoxButton.OK);
-        }
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="owner">A System.Windows.Window that represents the owner of the MessageBox</param>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <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 );
+    }
 
+    /// <summary>
+    /// Displays a message box that has a message and title bar caption; and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText, string caption )
+    {
+      return Show( messageText, caption, MessageBoxButton.OK );
+    }
 
-        public static MessageBoxResult Show(Window owner, string messageText, string caption)
-        {
-            return Show(owner, messageText, caption, MessageBoxButton.OK);
-        }
 
-        /// <summary>
-        /// Displays a message box that has a message and that returns a result.
-        /// </summary>
-        /// <param name="messageText">A System.String that specifies the text to display.</param>
-        /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-        /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
-        /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-        public static MessageBoxResult Show(string messageText, string caption, MessageBoxButton button)
-        {
-            return ShowCore(null, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None);
-        }
+    public static MessageBoxResult Show( Window owner, string messageText, string caption )
+    {
+      return Show( owner, messageText, caption, MessageBoxButton.OK );
+    }
 
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
+    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button )
+    {
+      return ShowCore( null, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None );
+    }
 
-        public static MessageBoxResult Show(Window owner, string messageText, string caption, MessageBoxButton button)
-        {
-            return ShowCore(owner, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None);
-        }
 
-        /// <summary>
-        /// Displays a message box that has a message and that returns a result.
-        /// </summary>
-        /// <param name="messageText">A System.String that specifies the text to display.</param>
-        /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-        /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
-        /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
-        /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-        public static MessageBoxResult Show(string messageText, string caption, MessageBoxButton button, MessageBoxImage icon)
-        {
-            return ShowCore(null, messageText, caption, button, icon, MessageBoxResult.None);
-        }
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button )
+    {
+      return ShowCore( owner, messageText, caption, button, MessageBoxImage.None, MessageBoxResult.None );
+    }
 
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
+    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
+    /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
+    {
+      return ShowCore( null, messageText, caption, button, icon, MessageBoxResult.None );
+    }
 
-        public static MessageBoxResult Show(Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon)
-        {
-            return ShowCore(owner, messageText, caption, button, icon, MessageBoxResult.None);
-        }
 
-        /// <summary>
-        /// Displays a message box that has a message and that returns a result.
-        /// </summary>
-        /// <param name="messageText">A System.String that specifies the text to display.</param>
-        /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
-        /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
-        /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
-        /// <param name="defaultResult">A System.Windows.MessageBoxResult value that specifies the default result of the MessageBox.</param>
-        /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
-        public static MessageBoxResult Show(string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult)
-        {
-            return ShowCore(null, messageText, caption, button, icon, defaultResult);
-        }
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon )
+    {
+      return ShowCore( owner, messageText, caption, button, icon, MessageBoxResult.None );
+    }
 
+    /// <summary>
+    /// Displays a message box that has a message and that returns a result.
+    /// </summary>
+    /// <param name="messageText">A System.String that specifies the text to display.</param>
+    /// <param name="caption">A System.String that specifies the title bar caption to display.</param>
+    /// <param name="button">A System.Windows.MessageBoxButton value that specifies which button or buttons to display.</param>
+    /// <param name="image"> A System.Windows.MessageBoxImage value that specifies the icon to display.</param>
+    /// <param name="defaultResult">A System.Windows.MessageBoxResult value that specifies the default result of the MessageBox.</param>
+    /// <returns>A System.Windows.MessageBoxResult value that specifies which message box button is clicked by the user.</returns>
+    public static MessageBoxResult Show( string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
+    {
+      return ShowCore( null, messageText, caption, button, icon, defaultResult );
+    }
 
-        public static MessageBoxResult Show(Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult)
-        {
-            return ShowCore(owner, messageText, caption, button, icon, defaultResult);
-        }
 
-        #endregion //Public Static
+    public static MessageBoxResult Show( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
+    {
+      return ShowCore( owner, messageText, caption, button, icon, defaultResult );
+    }
 
-        #region Protected
+    #endregion //Public Static
 
-        /// <summary>
-        /// Shows the container which contains the MessageBox.
-        /// </summary>
-        protected void Show()
-        {
-            Container.ShowDialog();
-        }
+    #region Protected
 
-        /// <summary>
-        /// Initializes the MessageBox.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        /// <param name="caption">The caption.</param>
-        /// <param name="button">The button.</param>
-        /// <param name="image">The image.</param>
-        protected void InitializeMessageBox(Window owner, string text, string caption, MessageBoxButton button, MessageBoxImage image, MessageBoxResult defaultResult)
-        {
-            Text = text;
-            Caption = caption;
-            _button = button;
-            _defaultResult = defaultResult;
-            _owner = owner;
-            SetImageSource(image);
-            Container = CreateContainer();
-        }
+    /// <summary>
+    /// Shows the container which contains the MessageBox.
+    /// </summary>
+    protected void Show()
+    {
+      Container.ShowDialog();
+    }
 
-        /// <summary>
-        /// Changes the control's visual state(s).
-        /// </summary>
-        /// <param name="name">name of the state</param>
-        /// <param name="useTransitions">True if state transitions should be used.</param>
-        protected void ChangeVisualState(string name, bool useTransitions)
-        {
-            VisualStateManager.GoToState(this, name, useTransitions);
-        }
+    /// <summary>
+    /// Initializes the MessageBox.
+    /// </summary>
+    /// <param name="text">The text.</param>
+    /// <param name="caption">The caption.</param>
+    /// <param name="button">The button.</param>
+    /// <param name="image">The image.</param>
+    protected void InitializeMessageBox( Window owner, string text, string caption, MessageBoxButton button, MessageBoxImage image, MessageBoxResult defaultResult )
+    {
+      Text = text;
+      Caption = caption;
+      _button = button;
+      _defaultResult = defaultResult;
+      _owner = owner;
+      SetImageSource( image );
+      Container = CreateContainer();
+    }
 
-        #endregion //Protected
+    /// <summary>
+    /// Changes the control's visual state(s).
+    /// </summary>
+    /// <param name="name">name of the state</param>
+    /// <param name="useTransitions">True if state transitions should be used.</param>
+    protected void ChangeVisualState( string name, bool useTransitions )
+    {
+      VisualStateManager.GoToState( this, name, useTransitions );
+    }
 
-        #region Private
+    #endregion //Protected
 
-        /// <summary>
-        /// Sets the button that represents the _defaultResult to the default button and gives it focus.
-        /// </summary>
-        private void SetDefaultResult()
-        {
-            var defaultButton = GetDefaultButtonFromDefaultResult();
-            if (defaultButton != null)
-            {
-                defaultButton.IsDefault = true;
-                defaultButton.Focus();
-            }
-        }
+    #region Private
 
-        /// <summary>
-        /// Gets the default button from the _defaultResult.
-        /// </summary>
-        /// <returns>The default button that represents the defaultResult</returns>
-        private Button GetDefaultButtonFromDefaultResult()
-        {
-            Button defaultButton = null;
-            switch (_defaultResult)
-            {
-                case MessageBoxResult.Cancel:
-                    defaultButton = GetMessageBoxButton("PART_CancelButton");
-                    break;
-                case MessageBoxResult.No:
-                    defaultButton = GetMessageBoxButton("PART_NoButton");
-                    break;
-                case MessageBoxResult.OK:
-                    defaultButton = GetMessageBoxButton("PART_OkButton");
-                    break;
-                case MessageBoxResult.Yes:
-                    defaultButton = GetMessageBoxButton("PART_YesButton");
-                    break;
-                case MessageBoxResult.None:
-                    defaultButton = GetDefaultButton();
-                    break;
-            }
-            return defaultButton;
-        }
+    /// <summary>
+    /// Sets the button that represents the _defaultResult to the default button and gives it focus.
+    /// </summary>
+    private void SetDefaultResult()
+    {
+      var defaultButton = GetDefaultButtonFromDefaultResult();
+      if( defaultButton != null )
+      {
+        defaultButton.IsDefault = true;
+        defaultButton.Focus();
+      }
+    }
 
-        /// <summary>
-        /// Gets the default button.
-        /// </summary>
-        /// <remarks>Used when the _defaultResult is set to None</remarks>
-        /// <returns>The button to use as the default</returns>
-        private Button GetDefaultButton()
-        {
-            Button defaultButton = null;
-            switch (_button)
-            {
-                case MessageBoxButton.OK:
-                case MessageBoxButton.OKCancel:
-                    defaultButton = GetMessageBoxButton("PART_OkButton");
-                    break;
-                case MessageBoxButton.YesNo:
-                case MessageBoxButton.YesNoCancel:
-                    defaultButton = GetMessageBoxButton("PART_YesButton");
-                    break;
-            }
-            return defaultButton;
-        }
+    /// <summary>
+    /// Gets the default button from the _defaultResult.
+    /// </summary>
+    /// <returns>The default button that represents the defaultResult</returns>
+    private Button GetDefaultButtonFromDefaultResult()
+    {
+      Button defaultButton = null;
+      switch( _defaultResult )
+      {
+        case MessageBoxResult.Cancel:
+          defaultButton = GetMessageBoxButton( "PART_CancelButton" );
+          break;
+        case MessageBoxResult.No:
+          defaultButton = GetMessageBoxButton( "PART_NoButton" );
+          break;
+        case MessageBoxResult.OK:
+          defaultButton = GetMessageBoxButton( "PART_OkButton" );
+          break;
+        case MessageBoxResult.Yes:
+          defaultButton = GetMessageBoxButton( "PART_YesButton" );
+          break;
+        case MessageBoxResult.None:
+          defaultButton = GetDefaultButton();
+          break;
+      }
+      return defaultButton;
+    }
 
-        /// <summary>
-        /// Gets a message box button.
-        /// </summary>
-        /// <param name="name">The name of the button to get.</param>
-        /// <returns>The button</returns>
-        private Button GetMessageBoxButton(string name)
-        {
-            Button button = GetTemplateChild(name) as Button;
-            return button;
-        }
+    /// <summary>
+    /// Gets the default button.
+    /// </summary>
+    /// <remarks>Used when the _defaultResult is set to None</remarks>
+    /// <returns>The button to use as the default</returns>
+    private Button GetDefaultButton()
+    {
+      Button defaultButton = null;
+      switch( _button )
+      {
+        case MessageBoxButton.OK:
+        case MessageBoxButton.OKCancel:
+          defaultButton = GetMessageBoxButton( "PART_OkButton" );
+          break;
+        case MessageBoxButton.YesNo:
+        case MessageBoxButton.YesNoCancel:
+          defaultButton = GetMessageBoxButton( "PART_YesButton" );
+          break;
+      }
+      return defaultButton;
+    }
 
-        /// <summary>
-        /// Shows the MessageBox.
-        /// </summary>
-        /// <param name="messageText">The message text.</param>
-        /// <param name="caption">The caption.</param>
-        /// <param name="button">The button.</param>
-        /// <param name="icon">The icon.</param>
-        /// <param name="defaultResult">The default result.</param>
-        /// <returns></returns>
-        private static MessageBoxResult ShowCore(Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult)
-        {
-            MessageBox msgBox = new MessageBox();
-            msgBox.InitializeMessageBox(owner, messageText, caption, button, icon, defaultResult);
-            msgBox.Show();
-            return msgBox.MessageBoxResult;
-        }
+    /// <summary>
+    /// Gets a message box button.
+    /// </summary>
+    /// <param name="name">The name of the button to get.</param>
+    /// <returns>The button</returns>
+    private Button GetMessageBoxButton( string name )
+    {
+      Button button = GetTemplateChild( name ) as Button;
+      return button;
+    }
 
-        /// <summary>
-        /// Resolves the owner Window of the MessageBox.
-        /// </summary>
-        /// <returns>the owner Window</returns>
-        private static Window ResolveOwnerWindow()
-        {
-            Window owner = null;
-            if (Application.Current != null)
-            {
-                foreach (Window w in Application.Current.Windows)
-                {
-                    if (w.IsActive)
-                    {
-                        owner = w;
-                        break;
-                    }
-                }
-            }
-            return owner;
-        }
+    /// <summary>
+    /// Shows the MessageBox.
+    /// </summary>
+    /// <param name="messageText">The message text.</param>
+    /// <param name="caption">The caption.</param>
+    /// <param name="button">The button.</param>
+    /// <param name="icon">The icon.</param>
+    /// <param name="defaultResult">The default result.</param>
+    /// <returns></returns>
+    private static MessageBoxResult ShowCore( Window owner, string messageText, string caption, MessageBoxButton button, MessageBoxImage icon, MessageBoxResult defaultResult )
+    {
+      MessageBox msgBox = new MessageBox();
+      msgBox.InitializeMessageBox( owner, messageText, caption, button, icon, defaultResult );
+      msgBox.Show();
+      return msgBox.MessageBoxResult;
+    }
 
-        /// <summary>
-        /// Sets the message image source.
-        /// </summary>
-        /// <param name="image">The image to show.</param>
-        private void SetImageSource(MessageBoxImage image)
-        {
-            String iconName = String.Empty;
-
-            switch (image)
-            {
-                case MessageBoxImage.Error:
-                    {
-                        iconName = "Error48.png";
-                        break;
-                    }
-                case MessageBoxImage.Information:
-                    {
-                        iconName = "Information48.png";
-                        break;
-                    }
-                case MessageBoxImage.Question:
-                    {
-                        iconName = "Question48.png";
-                        break;
-                    }
-                case MessageBoxImage.Warning:
-                    {
-                        iconName = "Warning48.png";
-                        break;
-                    }
-                case MessageBoxImage.None:
-                default:
-                    {
-                        return;
-                    }
-            }
-
-            ImageSource = (ImageSource)new ImageSourceConverter().ConvertFromString(String.Format("pack://application:,,,/WPFToolkit.Extended;component/MessageBox/Icons/{0}", iconName));
-        }
+    /// <summary>
+    /// Resolves the owner Window of the MessageBox.
+    /// </summary>
+    /// <returns>the owner Window</returns>
+    private static Window ResolveOwnerWindow()
+    {
+      Window owner = null;
+      if( Application.Current != null )
+      {
+        foreach( Window w in Application.Current.Windows )
+        {
+          if( w.IsActive )
+          {
+            owner = w;
+            break;
+          }
+        }
+      }
+      return owner;
+    }
 
-        /// <summary>
-        /// Creates the container which will host the MessageBox control.
-        /// </summary>
-        /// <returns></returns>
-        private Window CreateContainer()
-        {
-            var newWindow = new Window();
-            newWindow.AllowsTransparency = true;
-            newWindow.Background = Brushes.Transparent;
-            newWindow.Content = this;
-            newWindow.Owner = _owner ?? ResolveOwnerWindow();
-
-            if (newWindow.Owner != null)
-                newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner;
-            else
-                newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterScreen;
-
-            newWindow.ShowInTaskbar = false;
-            newWindow.SizeToContent = System.Windows.SizeToContent.WidthAndHeight;
-            newWindow.ResizeMode = System.Windows.ResizeMode.NoResize;
-            newWindow.WindowStyle = System.Windows.WindowStyle.None;
-            return newWindow;
-        }
+    /// <summary>
+    /// Sets the message image source.
+    /// </summary>
+    /// <param name="image">The image to show.</param>
+    private void SetImageSource( MessageBoxImage image )
+    {
+      String iconName = String.Empty;
+
+      switch( image )
+      {
+        case MessageBoxImage.Error:
+          {
+            iconName = "Error48.png";
+            break;
+          }
+        case MessageBoxImage.Information:
+          {
+            iconName = "Information48.png";
+            break;
+          }
+        case MessageBoxImage.Question:
+          {
+            iconName = "Question48.png";
+            break;
+          }
+        case MessageBoxImage.Warning:
+          {
+            iconName = "Warning48.png";
+            break;
+          }
+        case MessageBoxImage.None:
+        default:
+          {
+            return;
+          }
+      }
+
+      ImageSource = ( ImageSource )new ImageSourceConverter().ConvertFromString( String.Format( "pack://application:,,,/WPFToolkit.Extended;component/MessageBox/Icons/{0}", iconName ) );
+    }
 
-        #endregion //Private
+    /// <summary>
+    /// Creates the container which will host the MessageBox control.
+    /// </summary>
+    /// <returns></returns>
+    private Window CreateContainer()
+    {
+      var newWindow = new Window();
+      newWindow.AllowsTransparency = true;
+      newWindow.Background = Brushes.Transparent;
+      newWindow.Content = this;
+      newWindow.Owner = _owner ?? ResolveOwnerWindow();
+
+      if( newWindow.Owner != null )
+        newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterOwner;
+      else
+        newWindow.WindowStartupLocation = System.Windows.WindowStartupLocation.CenterScreen;
+
+      newWindow.ShowInTaskbar = false;
+      newWindow.SizeToContent = System.Windows.SizeToContent.WidthAndHeight;
+      newWindow.ResizeMode = System.Windows.ResizeMode.NoResize;
+      newWindow.WindowStyle = System.Windows.WindowStyle.None;
+      return newWindow;
+    }
 
-        #endregion //Methods
+    #endregion //Private
 
-        #region Event Handlers
+    #endregion //Methods
 
-        /// <summary>
-        /// Processes the move of a drag operation on the header.
-        /// </summary>
-        /// <param name="e">The <see cref="System.Windows.Controls.Primitives.DragDeltaEventArgs"/> instance containing the event data.</param>
-        private void ProcessMove(DragDeltaEventArgs e)
-        {
-            double left = 0.0;
+    #region Event Handlers
 
-            if (FlowDirection == System.Windows.FlowDirection.RightToLeft)
-                left = Container.Left - e.HorizontalChange;
-            else
-                left = Container.Left + e.HorizontalChange;
+    /// <summary>
+    /// Processes the move of a drag operation on the header.
+    /// </summary>
+    /// <param name="e">The <see cref="System.Windows.Controls.Primitives.DragDeltaEventArgs"/> instance containing the event data.</param>
+    private void ProcessMove( DragDeltaEventArgs e )
+    {
+      double left = 0.0;
 
-            Container.Left = left;
-            Container.Top = Container.Top + e.VerticalChange;
-        }
+      if( FlowDirection == System.Windows.FlowDirection.RightToLeft )
+        left = Container.Left - e.HorizontalChange;
+      else
+        left = Container.Left + e.HorizontalChange;
 
-        /// <summary>
-        /// Sets the MessageBoxResult according to the button pressed and then closes the MessageBox.
-        /// </summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="System.Windows.RoutedEventArgs"/> instance containing the event data.</param>
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            Button button = e.OriginalSource as Button;
-
-            if (button == null)
-                return;
-
-            switch (button.Name)
-            {
-                case "PART_NoButton":
-                    MessageBoxResult = MessageBoxResult.No;
-                    break;
-                case "PART_YesButton":
-                    MessageBoxResult = MessageBoxResult.Yes;
-                    break;
-                case "PART_CloseButton":
-                case "PART_CancelButton":
-                    MessageBoxResult = MessageBoxResult.Cancel;
-                    break;
-                case "PART_OkButton":
-                    MessageBoxResult = MessageBoxResult.OK;
-                    break;
-            }
-
-            Close();
-        }
+      Container.Left = left;
+      Container.Top = Container.Top + e.VerticalChange;
+    }
 
-        /// <summary>
-        /// Closes the MessageBox.
-        /// </summary>
-        private void Close()
-        {
-            Container.Close();
-        }
+    /// <summary>
+    /// Sets the MessageBoxResult according to the button pressed and then closes the MessageBox.
+    /// </summary>
+    /// <param name="sender">The source of the event.</param>
+    /// <param name="e">The <see cref="System.Windows.RoutedEventArgs"/> instance containing the event data.</param>
+    private void Button_Click( object sender, RoutedEventArgs e )
+    {
+      Button button = e.OriginalSource as Button;
+
+      if( button == null )
+        return;
+
+      switch( button.Name )
+      {
+        case "PART_NoButton":
+          MessageBoxResult = MessageBoxResult.No;
+          break;
+        case "PART_YesButton":
+          MessageBoxResult = MessageBoxResult.Yes;
+          break;
+        case "PART_CloseButton":
+        case "PART_CancelButton":
+          MessageBoxResult = MessageBoxResult.Cancel;
+          break;
+        case "PART_OkButton":
+          MessageBoxResult = MessageBoxResult.OK;
+          break;
+      }
+
+      Close();
+    }
 
-        #endregion //Event Handlers
+    /// <summary>
+    /// Closes the MessageBox.
+    /// </summary>
+    private void Close()
+    {
+      Container.Close();
     }
+
+    #endregion //Event Handlers
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs
index d47fcb08..d796049f 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Implementation/VisualStates.MessageBox.cs
@@ -1,17 +1,30 @@
-using System;
+/************************************************************************
 
-namespace Microsoft.Windows.Controls
-{
-    internal static partial class VisualStates
-    {
-        public const string MessageBoxButtonsGroup = "MessageBoxButtonsGroup";
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
 
-        public const string OK = "OK";
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
 
-        public const string OKCancel = "OKCancel";
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
 
-        public const string YesNo = "YesNo";
+   Visit http://xceed.com and follow @datagrid on Twitter.
 
-        public const string YesNoCancel = "YesNoCancel";
-    }
+  **********************************************************************/
+
+namespace Microsoft.Windows.Controls
+{
+  internal static partial class VisualStates
+  {
+    public const string MessageBoxButtonsGroup = "MessageBoxButtonsGroup";
+    public const string OK = "OK";
+    public const string OKCancel = "OKCancel";
+    public const string YesNo = "YesNo";
+    public const string YesNoCancel = "YesNoCancel";
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml
index 91375b76..085d39e6 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml
@@ -1,299 +1,329 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls">
 
-    <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="0.479" Color="#FFf4f5f6"/>
-                <GradientStop Offset="1" Color="#FFd0d6db"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFb5bdc8"/>
-                <GradientStop Offset="0.370" Color="#FF8399a9"/>
-                <GradientStop Offset="0.370" Color="#FF718597"/>
-                <GradientStop Offset="0.906" Color="#FFb9c1ca"/>
-                <GradientStop Offset="1" Color="#FFb9c1ca"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFb5bdc8" />
+            <GradientStop Offset="0.370" Color="#FF8399a9" />
+            <GradientStop Offset="0.370" Color="#FF718597" />
+            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
+            <GradientStop Offset="1" Color="#FFb9c1ca" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FF6b7c8d"/>
-                <GradientStop Offset="0.370" Color="#FF4d606f"/>
-                <GradientStop Offset="0.370" Color="#FF465460"/>
-                <GradientStop Offset="0.906" Color="#FF262d33"/>
-                <GradientStop Offset="1" Color="#FF262d33"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FF6b7c8d" />
+            <GradientStop Offset="0.370" Color="#FF4d606f" />
+            <GradientStop Offset="0.370" Color="#FF465460" />
+            <GradientStop Offset="0.906" Color="#FF262d33" />
+            <GradientStop Offset="1" Color="#FF262d33" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="#FF000000"/>
-        <Setter Property="Padding" Value="3"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}"></DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}"></DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
-                            <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0"/>
-                        </Border>
-                        <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                        <Path x:Name="path"
+   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
+      <Setter Property="Foreground" Value="#FF000000" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Button">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
+                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                  <Path x:Name="path"
 								Height="6"
 								Width="7"
 								Stretch="Fill"
 								Opacity="1"
 								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
-								Fill="White" Margin="0,0,0,1" Visibility="Collapsed" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+								Fill="White"
+                        Margin="0,0,0,1"
+                        Visibility="Collapsed" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
-    <!-- =============================================================================== -->
-    <!-- MessageBox                                                                      -->
-    <!-- =============================================================================== -->
+   <!-- =============================================================================== -->
+   <!-- MessageBox                                                                      -->
+   <!-- =============================================================================== -->
 
-    <ControlTemplate x:Key="MessageBoxDragWidgetTemplate" TargetType="{x:Type Thumb}">
-        <Border Background="Transparent">
-        </Border>
-    </ControlTemplate>
+   <ControlTemplate x:Key="MessageBoxDragWidgetTemplate" TargetType="{x:Type Thumb}">
+      <Border Background="Transparent" />
+   </ControlTemplate>
 
-    <Style TargetType="{x:Type local:MessageBox}">
-        <Setter Property="Background" Value="#FFFFFFFF"/>
-        <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CaptionForeground" Value="#FF000000" />
-        <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="IsEnabled" Value="true" />
-        <Setter Property="MinWidth" Value="350" />
-        <Setter Property="MinHeight" Value="50" />
-        <Setter Property="MaxHeight" Value="250" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
-        <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
-        <Setter Property="WindowOpacity" Value="1.0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:MessageBox}">
-                    <Grid x:Name="Root">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="group1">
-                                <VisualState x:Name="OK">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="OKCancel">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="YesNo">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
+   <Style TargetType="{x:Type local:MessageBox}">
+      <Setter Property="Background" Value="#FFFFFFFF" />
+      <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="CaptionForeground" Value="#FF000000" />
+      <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+      <Setter Property="IsEnabled" Value="true" />
+      <Setter Property="MinWidth" Value="350" />
+      <Setter Property="MinHeight" Value="50" />
+      <Setter Property="MaxHeight" Value="250" />
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="VerticalContentAlignment" Value="Top" />
+      <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
+      <Setter Property="WindowOpacity" Value="1.0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:MessageBox}">
+               <Grid x:Name="Root">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="group1">
+                        <VisualState x:Name="OK">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="OKCancel">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="YesNo">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
 
-                                <VisualState x:Name="YesNoCancel">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
+                        <VisualState x:Name="YesNoCancel">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
 
-                        <!-- Borders -->
-                        <Grid  x:Name="MessageBoxWindowGrid">
-                            <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}"/>
-                            <Grid Margin="0" Background="{x:Null}">
-                                <Border x:Name="MessageBoxWindow" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}"/>
-                                <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7"/>
-                            </Grid>
-                        </Grid>
+                  <!-- Borders -->
+                  <Grid  x:Name="MessageBoxWindowGrid">
+                     <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                     <Grid Margin="0" Background="{x:Null}">
+                        <Border x:Name="MessageBoxWindow" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                        <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7" />
+                     </Grid>
+                  </Grid>
 
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" MinHeight="26"/>
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-
-                            <!-- Content Border -->
-                            <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-                                <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1"/>
-                                <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" MinHeight="26" />
+                        <RowDefinition />
+                     </Grid.RowDefinitions>
 
-                                    <Grid MinWidth="350">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition />
-                                            <RowDefinition Height="Auto" />
-                                        </Grid.RowDefinitions>
+                     <!-- Content Border -->
+                     <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
+                        <Grid.RowDefinitions>
+                           <RowDefinition />
+                           <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1" />
+                        <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
 
-                                        <Grid Margin="24,16,24,22">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="*"/>
-                                            </Grid.ColumnDefinitions>
+                           <Grid MinWidth="350">
+                              <Grid.RowDefinitions>
+                                 <RowDefinition />
+                                 <RowDefinition Height="Auto" />
+                              </Grid.RowDefinitions>
 
-                                            <!-- Message Image -->
-                                            <Image x:Name="MessageBoxImage" VerticalAlignment="Top" SnapsToDevicePixels="True" Stretch="None"  Margin="-6,-1,10,-4" Source="{TemplateBinding ImageSource}"></Image>
+                              <Grid Margin="24,16,24,22">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                 </Grid.ColumnDefinitions>
 
-                                            <!-- Message Text -->
-                                            <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
-                                                <TextBlock x:Name="MessageText" TextWrapping="Wrap" VerticalAlignment="Center" MaxWidth="450"
-                                                           Text="{TemplateBinding Text}" 
-                                                           FontFamily="{TemplateBinding FontFamily}"
-                                                           FontSize="{TemplateBinding FontSize}"
-                                                           FontStyle="{TemplateBinding FontStyle}"
-                                                           FontWeight="{TemplateBinding FontWeight}"
-                                                           Foreground="{TemplateBinding Foreground}"/>
-                                            </ScrollViewer>
+                                 <!-- Message Image -->
+                                 <Image x:Name="MessageBoxImage" VerticalAlignment="Top" SnapsToDevicePixels="True" Stretch="None"  Margin="-6,-1,10,-4" Source="{TemplateBinding ImageSource}" />
 
-                                        </Grid>
+                                 <!-- Message Text -->
+                                 <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
+                                    <TextBlock x:Name="MessageText"
+                                               TextWrapping="Wrap"
+                                               VerticalAlignment="Center"
+                                               MaxWidth="450"
+                                               Text="{TemplateBinding Text}" 
+                                               FontFamily="{TemplateBinding FontFamily}"
+                                               FontSize="{TemplateBinding FontSize}"
+                                               FontStyle="{TemplateBinding FontStyle}"
+                                               FontWeight="{TemplateBinding FontWeight}"
+                                               Foreground="{TemplateBinding Foreground}" />
+                                 </ScrollViewer>
 
-                                        <!-- Buttons -->
-                                        <Grid Grid.Row="1" HorizontalAlignment="Right" Margin="12,0,12,12">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="Auto"/>
-                                            </Grid.ColumnDefinitions>
-                                            <Button Grid.Column="0" x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding YesButtonContent}" />
-                                            <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding NoButtonContent}" />
-                                            <Button Grid.Column="2" x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding OkButtonContent}" />
-                                            <Button Grid.Column="3" x:Name="PART_CancelButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding CancelButtonContent}" IsCancel="True" />
-                                        </Grid>
-                                    </Grid>
-                                </Border>
-                            </Grid>
+                              </Grid>
 
-                            <!-- Header -->
-                            <Border x:Name="HeaderArea" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
-                                <Grid>
-                                    <Grid x:Name="CaptionHeader"  Margin="1,1,105,0" VerticalAlignment="Center">
-                                        <!-- Caption -->
-                                        <ContentControl x:Name="Caption" Margin="5,0,0,0" IsTabStop="False" HorizontalAlignment="Stretch"
-                                                        Content="{TemplateBinding Caption}"
-                                                        Foreground="{TemplateBinding CaptionForeground}"/>
-
-                                    </Grid>
-                                    <Thumb x:Name="PART_DragWidget" Template="{StaticResource MessageBoxDragWidgetTemplate}" IsTabStop="False" />
-                                </Grid>
-                            </Border>
+                              <!-- Buttons -->
+                              <Grid Grid.Row="1" HorizontalAlignment="Right" Margin="12,0,12,12">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                 </Grid.ColumnDefinitions>
+                                 <Button Grid.Column="0" x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding YesButtonContent}" />
+                                 <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding NoButtonContent}" />
+                                 <Button Grid.Column="2" x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding OkButtonContent}" />
+                                 <Button Grid.Column="3" x:Name="PART_CancelButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding CancelButtonContent}" IsCancel="True" />
+                              </Grid>
+                           </Grid>
+                        </Border>
+                     </Grid>
 
+                     <!-- Header -->
+                     <Border x:Name="HeaderArea" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
+                        <Grid>
+                           <Grid x:Name="CaptionHeader"  Margin="1,1,105,0" VerticalAlignment="Center">
+                              <!-- Caption -->
+                              <ContentControl x:Name="Caption"
+                                              Margin="5,0,0,0"
+                                              IsTabStop="False"
+                                              HorizontalAlignment="Stretch"
+                                              Content="{TemplateBinding Caption}"
+                                              Foreground="{TemplateBinding CaptionForeground}" />
+                           </Grid>
+                           <Thumb x:Name="PART_DragWidget" Template="{StaticResource MessageBoxDragWidgetTemplate}" IsTabStop="False" />
                         </Grid>
+                     </Border>
 
-                        <Border x:Name="Resize" BorderThickness="7" BorderBrush="Transparent" />
+                  </Grid>
 
-                        <!-- Close Button -->
-                        <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
-                            <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Height="17" Width="43" IsTabStop="False">
-                                <Path Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Width="12" Fill="#E4FFFFFF" Stretch="Fill" Stroke="#FF535666" 
-                                      Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z"/>
-                            </Button>
-                        </Border>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                  <Border x:Name="Resize" BorderThickness="7" BorderBrush="Transparent" />
+
+                  <!-- Close Button -->
+                  <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
+                     <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Height="17" Width="43" IsTabStop="False">
+                        <Path Height="10"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"
+                              Width="12"
+                              Fill="#E4FFFFFF"
+                              Stretch="Fill"
+                              Stroke="#FF535666" 
+                              Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z" />
+                     </Button>
+                  </Border>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
index b939e901..13c3a374 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Implementation/MultiLineTextEditor.cs
@@ -1,181 +1,241 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Input;
 using System.Windows.Controls.Primitives;
+using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls
 {
-    public class MultiLineTextEditor : ContentControl
+  public class MultiLineTextEditor : ContentControl
+  {
+    #region Members
+
+    Thumb _resizeThumb;
+
+    #endregion //Members
+
+    #region Properties
+
+    public static readonly DependencyProperty DropDownHeightProperty = DependencyProperty.Register( "DropDownHeight", typeof( double ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( 150.0 ) );
+    public double DropDownHeight
+    {
+      get
+      {
+        return ( double )GetValue( DropDownHeightProperty );
+      }
+      set
+      {
+        SetValue( DropDownHeightProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty DropDownWidthProperty = DependencyProperty.Register( "DropDownWidth", typeof( double ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( 200.0 ) );
+    public double DropDownWidth
+    {
+      get
+      {
+        return ( double )GetValue( DropDownWidthProperty );
+      }
+      set
+      {
+        SetValue( DropDownWidthProperty, value );
+      }
+    }
+
+    #region IsOpen
+
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false, OnIsOpenChanged ) );
+    public bool IsOpen
     {
-        #region Members
-
-        Thumb _resizeThumb;
-
-        #endregion //Members
-
-        #region Properties
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty DropDownHeightProperty = DependencyProperty.Register("DropDownHeight", typeof(double), typeof(MultiLineTextEditor), new UIPropertyMetadata(150.0));
-        public double DropDownHeight
-        {
-            get { return (double)GetValue(DropDownHeightProperty); }
-            set { SetValue(DropDownHeightProperty, value); }
-        }
+    private static void OnIsOpenChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MultiLineTextEditor multiLineTextEditor = o as MultiLineTextEditor;
+      if( multiLineTextEditor != null )
+        multiLineTextEditor.OnIsOpenChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
 
-        public static readonly DependencyProperty DropDownWidthProperty = DependencyProperty.Register("DropDownWidth", typeof(double), typeof(MultiLineTextEditor), new UIPropertyMetadata(200.0));
-        public double DropDownWidth
-        {
-            get { return (double)GetValue(DropDownWidthProperty); }
-            set { SetValue(DropDownWidthProperty, value); }
-        }
+    protected virtual void OnIsOpenChanged( bool oldValue, bool newValue )
+    {
 
-        #region IsOpen
+    }
 
-        public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register("IsOpen", typeof(bool), typeof(MultiLineTextEditor), new UIPropertyMetadata(false, OnIsOpenChanged));
-        public bool IsOpen
-        {
-            get { return (bool)GetValue(IsOpenProperty); }
-            set { SetValue(IsOpenProperty, value); }
-        }
+    #endregion //IsOpen
 
-        private static void OnIsOpenChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            MultiLineTextEditor multiLineTextEditor = o as MultiLineTextEditor;
-            if (multiLineTextEditor != null)
-                multiLineTextEditor.OnIsOpenChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
-
-        protected virtual void OnIsOpenChanged(bool oldValue, bool newValue)
-        {
+    public static readonly DependencyProperty IsSpellCheckEnabledProperty = DependencyProperty.Register( "IsSpellCheckEnabled", typeof( bool ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( false ) );
+    public bool IsSpellCheckEnabled
+    {
+      get
+      {
+        return ( bool )GetValue( IsSpellCheckEnabledProperty );
+      }
+      set
+      {
+        SetValue( IsSpellCheckEnabledProperty, value );
+      }
+    }
 
-        }
-
-        #endregion //IsOpen
-
-        public static readonly DependencyProperty IsSpellCheckEnabledProperty = DependencyProperty.Register("IsSpellCheckEnabled", typeof(bool), typeof(MultiLineTextEditor), new UIPropertyMetadata(false));
-        public bool IsSpellCheckEnabled
-        {
-            get { return (bool)GetValue(IsSpellCheckEnabledProperty); }
-            set { SetValue(IsSpellCheckEnabledProperty, value); }
-        }
-        
-
-        #region Text
-
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(MultiLineTextEditor), new FrameworkPropertyMetadata(String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextChanged));
-        public string Text
-        {
-            get { return (string)GetValue(TextProperty); }
-            set { SetValue(TextProperty, value); }
-        }
-
-        private static void OnTextChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            MultiLineTextEditor textEditor = o as MultiLineTextEditor;
-            if (textEditor != null)
-                textEditor.OnTextChanged((string)e.OldValue, (string)e.NewValue);
-        }
-
-        protected virtual void OnTextChanged(string oldValue, string newValue)
-        {
-
-        }
-
-        #endregion //Text
-
-        public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register("TextAlignment", typeof(TextAlignment), typeof(MultiLineTextEditor), new UIPropertyMetadata(TextAlignment.Left));
-        public TextAlignment TextAlignment
-        {
-            get { return (TextAlignment)GetValue(TextAlignmentProperty); }
-            set { SetValue(TextAlignmentProperty, value); }
-        }
-
-        public static readonly DependencyProperty TextWrappingProperty = DependencyProperty.Register("TextWrapping", typeof(TextWrapping), typeof(MultiLineTextEditor), new UIPropertyMetadata(TextWrapping.NoWrap));
-        public TextWrapping TextWrapping
-        {
-            get { return (TextWrapping)GetValue(TextWrappingProperty); }
-            set { SetValue(TextWrappingProperty, value); }
-        }
-        
-
-        #endregion //Properties
-
-        #region Constructors
-
-        static MultiLineTextEditor()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(MultiLineTextEditor), new FrameworkPropertyMetadata(typeof(MultiLineTextEditor)));
-        }
 
-        public MultiLineTextEditor()
-        {
-            Keyboard.AddKeyDownHandler(this, OnKeyDown);
-            Mouse.AddPreviewMouseDownOutsideCapturedElementHandler(this, OnMouseDownOutsideCapturedElement);
-        }
-
-        #endregion //Constructors
-
-        #region Bass Class Overrides
-
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-
-            if (_resizeThumb != null)
-                _resizeThumb.DragDelta -= ResizeThumb_DragDelta;
-
-            _resizeThumb = GetTemplateChild("PART_ResizeThumb") as Thumb;
-
-            if (_resizeThumb != null)
-                _resizeThumb.DragDelta += ResizeThumb_DragDelta;
-        }
-
-        #endregion //Bass Class Overrides
-
-        #region Event Handlers
-
-        private void OnKeyDown(object sender, KeyEventArgs e)
-        {
-            switch (e.Key)
-            {
-                case Key.Escape:
-                case Key.Tab:
-                    {
-                        CloseEditor();
-                        break;
-                    }
-            }
-        }
+    #region Text
 
-        private void OnMouseDownOutsideCapturedElement(object sender, MouseButtonEventArgs e)
-        {
-            CloseEditor();
-        }
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( MultiLineTextEditor ), new FrameworkPropertyMetadata( String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextChanged ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
 
-        void ResizeThumb_DragDelta(object sender, DragDeltaEventArgs e)
-        {
-            double yadjust = DropDownHeight + e.VerticalChange;
-            double xadjust = DropDownWidth + e.HorizontalChange;
+    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      MultiLineTextEditor textEditor = o as MultiLineTextEditor;
+      if( textEditor != null )
+        textEditor.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
 
-            if ((xadjust >= 0) && (yadjust >= 0))
-            {
-                DropDownWidth = xadjust;
-                DropDownHeight = yadjust;
-            }
-        }
+    protected virtual void OnTextChanged( string oldValue, string newValue )
+    {
 
-        #endregion //Event Handlers
+    }
 
-        #region Methods
+    #endregion //Text
 
-        private void CloseEditor()
-        {
-            if (IsOpen)
-                IsOpen = false;
-            ReleaseMouseCapture();
-        }
+    public static readonly DependencyProperty TextAlignmentProperty = DependencyProperty.Register( "TextAlignment", typeof( TextAlignment ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( TextAlignment.Left ) );
+    public TextAlignment TextAlignment
+    {
+      get
+      {
+        return ( TextAlignment )GetValue( TextAlignmentProperty );
+      }
+      set
+      {
+        SetValue( TextAlignmentProperty, value );
+      }
+    }
 
-        #endregion //Methods
+    public static readonly DependencyProperty TextWrappingProperty = DependencyProperty.Register( "TextWrapping", typeof( TextWrapping ), typeof( MultiLineTextEditor ), new UIPropertyMetadata( TextWrapping.NoWrap ) );
+    public TextWrapping TextWrapping
+    {
+      get
+      {
+        return ( TextWrapping )GetValue( TextWrappingProperty );
+      }
+      set
+      {
+        SetValue( TextWrappingProperty, value );
+      }
     }
+
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static MultiLineTextEditor()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( MultiLineTextEditor ), new FrameworkPropertyMetadata( typeof( MultiLineTextEditor ) ) );
+    }
+
+    public MultiLineTextEditor()
+    {
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
+
+    #endregion //Constructors
+
+    #region Bass Class Overrides
+
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _resizeThumb != null )
+        _resizeThumb.DragDelta -= ResizeThumb_DragDelta;
+
+      _resizeThumb = GetTemplateChild( "PART_ResizeThumb" ) as Thumb;
+
+      if( _resizeThumb != null )
+        _resizeThumb.DragDelta += ResizeThumb_DragDelta;
+    }
+
+    #endregion //Bass Class Overrides
+
+    #region Event Handlers
+
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+        case Key.Tab:
+          {
+            CloseEditor();
+            break;
+          }
+      }
+    }
+
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseEditor();
+    }
+
+    void ResizeThumb_DragDelta( object sender, DragDeltaEventArgs e )
+    {
+      double yadjust = DropDownHeight + e.VerticalChange;
+      double xadjust = DropDownWidth + e.HorizontalChange;
+
+      if( ( xadjust >= 0 ) && ( yadjust >= 0 ) )
+      {
+        DropDownWidth = xadjust;
+        DropDownHeight = yadjust;
+      }
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    private void CloseEditor()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml
index 51dda2be..d9000fc1 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml
@@ -1,124 +1,162 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-    <Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Images/Notes16.png" />
+   <Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Images/Notes16.png" />
 
-    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <Style x:Key="ToggleButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Grid SnapsToDevicePixels="True">
+   <Style x:Key="ToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
 
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-
-                            <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-                                <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-                            </Border>
-
-                            <chrome:ButtonChrome x:Name="ToggleButtonChrome" Grid.Column="1"
-                                             CornerRadius="0,2.75,2.75,0"
-                                            RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
-                                            RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
-											RenderMouseOver="{TemplateBinding IsMouseOver}"
-											RenderPressed="{TemplateBinding IsPressed}" >
-
-                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
-                                    <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                </Grid>
-                            </chrome:ButtonChrome>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                     </Grid.ColumnDefinitions>
+
+                     <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                        <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                     </Border>
+
+                     <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                          Grid.Column="1"
+                                          CornerRadius="0,2.75,2.75,0"
+                                          RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
+                                          RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
+											         RenderMouseOver="{TemplateBinding IsMouseOver}"
+											         RenderPressed="{TemplateBinding IsPressed}">
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
                         </Grid>
+                     </chrome:ButtonChrome>
+                  </Grid>
 
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type local:MultiLineTextEditor}">
-        <Setter Property="Background" Value="White"/>
-        <Setter Property="BorderBrush">
-            <Setter.Value>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="#FFA3AEB9" Offset="0" />
-                    <GradientStop Color="#FF8399A9" Offset="0.375" />
-                    <GradientStop Color="#FF718597" Offset="0.375" />
-                    <GradientStop Color="#FF617584" Offset="1" />
-                </LinearGradientBrush>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="BorderThickness" Value="1,1,0,1" />
-        <Setter Property="Content" Value="{StaticResource DefaultContent}" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Padding" Value="2,0,0,0" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:MultiLineTextEditor}">
-                    <Grid x:Name="Root">
-                        <ToggleButton x:Name="PART_DropDownButton" Grid.Column="1" IsTabStop="True" MinHeight="22" SnapsToDevicePixels="True"
-                                      Background="{TemplateBinding Background}" 
-                                      BorderBrush="{TemplateBinding BorderBrush}" 
-                                      BorderThickness="{TemplateBinding BorderThickness}" 
-                                      Padding="{TemplateBinding Padding}"
-                                      Content="{TemplateBinding Content}"
-                                      ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Style="{StaticResource ToggleButtonStyle}"
-                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-                        <Popup IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}" StaysOpen="False"
-                               Placement="Bottom" SnapsToDevicePixels="True" AllowsTransparency="True" Focusable="False" PopupAnimation="Slide"
-                               Width="{TemplateBinding DropDownWidth}" Height="{TemplateBinding DropDownHeight}">
-                            <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
-                                <Grid>
-                                    <TextBox x:Name="PART_TextBox" AcceptsReturn="true" TextWrapping="{TemplateBinding TextWrapping}" Padding="{TemplateBinding Padding}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
-                                             SpellCheck.IsEnabled="{TemplateBinding IsSpellCheckEnabled}"
-                                             Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                             TextAlignment="{TemplateBinding TextAlignment}"
-                                             Margin="3" />
-                                    <Thumb x:Name="PART_ResizeThumb" HorizontalAlignment="Right" VerticalAlignment="Bottom" Cursor="SizeNWSE">
-                                        <Thumb.Template>
-                                            <ControlTemplate TargetType="{x:Type Thumb}">
-                                                <Grid Background="Transparent">
-                                                    <Path Data="M0.5,6.5 L6.5,0.5 M6.5,3.5 L3.5,6.5" Stroke="Black" StrokeThickness="1" />
-                                                </Grid>
-                                            </ControlTemplate>
-                                        </Thumb.Template>
-                                    </Thumb>
-                                </Grid>
-                            </Border>
-                        </Popup>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:MultiLineTextEditor}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+               <GradientStop Color="#FFA3AEB9" Offset="0" />
+               <GradientStop Color="#FF8399A9" Offset="0.375" />
+               <GradientStop Color="#FF718597" Offset="0.375" />
+               <GradientStop Color="#FF617584" Offset="1" />
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="Content" Value="{StaticResource DefaultContent}" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Padding" Value="2,0,0,0" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:MultiLineTextEditor}">
+               <Grid x:Name="Root">
+                  <ToggleButton x:Name="PART_DropDownButton"
+                                Grid.Column="1"
+                                IsTabStop="True"
+                                MinHeight="22"
+                                SnapsToDevicePixels="True"
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                Padding="{TemplateBinding Padding}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                Style="{StaticResource ToggleButtonStyle}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                  <Popup IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         SnapsToDevicePixels="True"
+                         AllowsTransparency="True"
+                         Focusable="False"
+                         PopupAnimation="Slide"
+                         Width="{TemplateBinding DropDownWidth}"
+                         Height="{TemplateBinding DropDownHeight}">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                        <Grid>
+                           <TextBox x:Name="PART_TextBox"
+                                    AcceptsReturn="true"
+                                    TextWrapping="{TemplateBinding TextWrapping}"
+                                    Padding="{TemplateBinding Padding}"
+                                    VerticalScrollBarVisibility="Auto"
+                                    HorizontalScrollBarVisibility="Auto"
+                                    SpellCheck.IsEnabled="{TemplateBinding IsSpellCheckEnabled}"
+                                    Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                    TextAlignment="{TemplateBinding TextAlignment}"
+                                    Margin="3" />
+                           <Thumb x:Name="PART_ResizeThumb" HorizontalAlignment="Right" VerticalAlignment="Bottom" Cursor="SizeNWSE">
+                              <Thumb.Template>
+                                 <ControlTemplate TargetType="{x:Type Thumb}">
+                                    <Grid Background="Transparent">
+                                       <Path Data="M0.5,6.5 L6.5,0.5 M6.5,3.5 L3.5,6.5" Stroke="Black" StrokeThickness="1" />
+                                    </Grid>
+                                 </ControlTemplate>
+                              </Thumb.Template>
+                           </Thumb>
+                        </Grid>
+                     </Border>
+                  </Popup>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs
index 2d87b5b7..e5ea5ef3 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DecimalUpDown.cs
@@ -1,102 +1,120 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 
 namespace Microsoft.Windows.Controls
 {
-    public class DecimalUpDown : NumericUpDown<decimal?>
+  public class DecimalUpDown : NumericUpDown<decimal?>
+  {
+    #region Constructors
+
+    static DecimalUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( typeof( DecimalUpDown ) ) );
+      DefaultValueProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( default( decimal ) ) );
+      IncrementProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( 1m ) );
+      MaximumProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( decimal.MaxValue ) );
+      MinimumProperty.OverrideMetadata( typeof( DecimalUpDown ), new FrameworkPropertyMetadata( decimal.MinValue ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override decimal? CoerceValue( decimal? value )
+    {
+      if( value < Minimum )
+        return Minimum;
+      else if( value > Maximum )
+        return Maximum;
+      else
+        return value;
+    }
+
+    protected override void OnIncrement()
+    {
+      if( Value.HasValue )
+        Value += Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override void OnDecrement()
     {
-        #region Constructors
-
-        static DecimalUpDown()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(DecimalUpDown), new FrameworkPropertyMetadata(typeof(DecimalUpDown)));
-            DefaultValueProperty.OverrideMetadata(typeof(DecimalUpDown), new FrameworkPropertyMetadata(default(decimal)));
-            IncrementProperty.OverrideMetadata(typeof(DecimalUpDown), new FrameworkPropertyMetadata(1m));
-            MaximumProperty.OverrideMetadata(typeof(DecimalUpDown), new FrameworkPropertyMetadata(decimal.MaxValue));
-            MinimumProperty.OverrideMetadata(typeof(DecimalUpDown), new FrameworkPropertyMetadata(decimal.MinValue));
-        }
-
-        #endregion //Constructors
-
-        #region Base Class Overrides
-
-        protected override decimal? CoerceValue(decimal? value)
-        {
-            if (value < Minimum)
-                return Minimum;
-            else if (value > Maximum)
-                return Maximum;
-            else
-                return value;
-        }
-
-        protected override void OnIncrement()
-        {
-            if (Value.HasValue)
-                Value += Increment;
-            else
-                Value = DefaultValue;
-        }
-
-        protected override void OnDecrement()
-        {
-            if (Value.HasValue)
-                Value -= Increment;
-            else
-                Value = DefaultValue;
-        }
-
-        protected override decimal? ConvertTextToValue(string text)
-        {
-            decimal? result = null;
-
-            if (String.IsNullOrEmpty(text))
-                return result;
-
-            try
-            {
-                result = FormatString.Contains("P") ? ParsePercent(text, CultureInfo) : ParseDecimal(text, CultureInfo);
-                result = CoerceValue(result);
-            }
-            catch
-            {
-                Text = ConvertValueToText();
-                return Value;
-            }
-
-            return result;
-        }
-
-        protected override string ConvertValueToText()
-        {
-            if (Value == null)
-                return string.Empty;
-
-            return Value.Value.ToString(FormatString, CultureInfo);
-        }
-
-        protected override void SetValidSpinDirection()
-        {
-            ValidSpinDirections validDirections = ValidSpinDirections.None;
-
-            if (Value < Maximum || !Value.HasValue)
-                validDirections = validDirections | ValidSpinDirections.Increase;
-
-            if (Value > Minimum || !Value.HasValue)
-                validDirections = validDirections | ValidSpinDirections.Decrease;
-
-            if (Spinner != null)
-                Spinner.ValidSpinDirection = validDirections;
-        }
-
-        protected override void ValidateValue(decimal? value)
-        {
-            if (value < Minimum)
-                Value = Minimum;
-            else if (value > Maximum)
-                Value = Maximum;
-        }
-
-        #endregion //Base Class Overrides
+      if( Value.HasValue )
+        Value -= Increment;
+      else
+        Value = DefaultValue;
     }
+
+    protected override decimal? ConvertTextToValue( string text )
+    {
+      decimal? result = null;
+
+      if( String.IsNullOrEmpty( text ) )
+        return result;
+
+      try
+      {
+        result = FormatString.Contains( "P" ) ? ParsePercent( text, CultureInfo ) : ParseDecimal( text, CultureInfo );
+        result = CoerceValue( result );
+      }
+      catch
+      {
+        Text = ConvertValueToText();
+        return Value;
+      }
+
+      return result;
+    }
+
+    protected override string ConvertValueToText()
+    {
+      if( Value == null )
+        return string.Empty;
+
+      return Value.Value.ToString( FormatString, CultureInfo );
+    }
+
+    protected override void SetValidSpinDirection()
+    {
+      ValidSpinDirections validDirections = ValidSpinDirections.None;
+
+      if( Value < Maximum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Increase;
+
+      if( Value > Minimum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Decrease;
+
+      if( Spinner != null )
+        Spinner.ValidSpinDirection = validDirections;
+    }
+
+    protected override void ValidateValue( decimal? value )
+    {
+      if( value < Minimum )
+        Value = Minimum;
+      else if( value > Maximum )
+        Value = Maximum;
+    }
+
+    #endregion //Base Class Overrides
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs
index ab8e9e88..7e5ce69d 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/DoubleUpDown.cs
@@ -1,102 +1,120 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 
 namespace Microsoft.Windows.Controls
 {
-    public class DoubleUpDown : NumericUpDown<double?>
+  public class DoubleUpDown : NumericUpDown<double?>
+  {
+    #region Constructors
+
+    static DoubleUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( typeof( DoubleUpDown ) ) );
+      DefaultValueProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( default( double ) ) );
+      IncrementProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( 1d ) );
+      MaximumProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( double.MaxValue ) );
+      MinimumProperty.OverrideMetadata( typeof( DoubleUpDown ), new FrameworkPropertyMetadata( double.MinValue ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override double? CoerceValue( double? value )
+    {
+      if( value < Minimum )
+        return Minimum;
+      else if( value > Maximum )
+        return Maximum;
+      else
+        return value;
+    }
+
+    protected override void OnIncrement()
+    {
+      if( Value.HasValue )
+        Value += Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override void OnDecrement()
     {
-        #region Constructors
-
-        static DoubleUpDown()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(DoubleUpDown), new FrameworkPropertyMetadata(typeof(DoubleUpDown)));
-            DefaultValueProperty.OverrideMetadata(typeof(DoubleUpDown), new FrameworkPropertyMetadata(default(double)));
-            IncrementProperty.OverrideMetadata(typeof(DoubleUpDown), new FrameworkPropertyMetadata(1d));
-            MaximumProperty.OverrideMetadata(typeof(DoubleUpDown), new FrameworkPropertyMetadata(double.MaxValue));
-            MinimumProperty.OverrideMetadata(typeof(DoubleUpDown), new FrameworkPropertyMetadata(double.MinValue));
-        }
-
-        #endregion //Constructors
-
-        #region Base Class Overrides
-
-        protected override double? CoerceValue(double? value)
-        {
-            if (value < Minimum)
-                return Minimum;
-            else if (value > Maximum)
-                return Maximum;
-            else
-                return value;
-        }
-
-        protected override void OnIncrement()
-        {
-            if (Value.HasValue)
-                Value += Increment;
-            else
-                Value = DefaultValue;
-        }
-
-        protected override void OnDecrement()
-        {
-            if (Value.HasValue)
-                Value -= Increment;
-            else
-                Value = DefaultValue;
-        }
-
-        protected override double? ConvertTextToValue(string text)
-        {
-            double? result = null;
-
-            if (String.IsNullOrEmpty(text))
-                return result;
-
-            try
-            {
-                result = FormatString.Contains("P") ? Decimal.ToDouble(ParsePercent(text, CultureInfo)) : ParseDouble(text, CultureInfo);
-                result = CoerceValue(result);
-            }
-            catch
-            {
-                Text = ConvertValueToText();
-                return Value;
-            }
-
-            return result;
-        }
-
-        protected override string ConvertValueToText()
-        {
-            if (Value == null)
-                return string.Empty;
-
-            return Value.Value.ToString(FormatString, CultureInfo);
-        }
-
-        protected override void SetValidSpinDirection()
-        {
-            ValidSpinDirections validDirections = ValidSpinDirections.None;
-
-            if (Value < Maximum || !Value.HasValue)
-                validDirections = validDirections | ValidSpinDirections.Increase;
-
-            if (Value > Minimum || !Value.HasValue)
-                validDirections = validDirections | ValidSpinDirections.Decrease;
-
-            if (Spinner != null)
-                Spinner.ValidSpinDirection = validDirections;
-        }
-
-        protected override void ValidateValue(double? value)
-        {
-            if (value < Minimum)
-                Value = Minimum;
-            else if (value > Maximum)
-                Value = Maximum;
-        }
-
-        #endregion //Base Class Overrides
+      if( Value.HasValue )
+        Value -= Increment;
+      else
+        Value = DefaultValue;
     }
+
+    protected override double? ConvertTextToValue( string text )
+    {
+      double? result = null;
+
+      if( String.IsNullOrEmpty( text ) )
+        return result;
+
+      try
+      {
+        result = FormatString.Contains( "P" ) ? Decimal.ToDouble( ParsePercent( text, CultureInfo ) ) : ParseDouble( text, CultureInfo );
+        result = CoerceValue( result );
+      }
+      catch
+      {
+        Text = ConvertValueToText();
+        return Value;
+      }
+
+      return result;
+    }
+
+    protected override string ConvertValueToText()
+    {
+      if( Value == null )
+        return string.Empty;
+
+      return Value.Value.ToString( FormatString, CultureInfo );
+    }
+
+    protected override void SetValidSpinDirection()
+    {
+      ValidSpinDirections validDirections = ValidSpinDirections.None;
+
+      if( Value < Maximum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Increase;
+
+      if( Value > Minimum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Decrease;
+
+      if( Spinner != null )
+        Spinner.ValidSpinDirection = validDirections;
+    }
+
+    protected override void ValidateValue( double? value )
+    {
+      if( value < Minimum )
+        Value = Minimum;
+      else if( value > Maximum )
+        Value = Maximum;
+    }
+
+    #endregion //Base Class Overrides
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs
index 12430d38..840baf32 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/IntegerUpDown.cs
@@ -1,103 +1,121 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 
 namespace Microsoft.Windows.Controls
 {
-    public class IntegerUpDown : NumericUpDown<int?>
+  public class IntegerUpDown : NumericUpDown<int?>
+  {
+    #region Constructors
+
+    static IntegerUpDown()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( typeof( IntegerUpDown ) ) );
+      DefaultValueProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( 0 ) );
+      IncrementProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( 1 ) );
+      MaximumProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( int.MaxValue ) );
+      MinimumProperty.OverrideMetadata( typeof( IntegerUpDown ), new FrameworkPropertyMetadata( int.MinValue ) );
+    }
+
+    #endregion //Constructors
+
+    #region Base Class Overrides
+
+    protected override int? CoerceValue( int? value )
+    {
+      if( value < Minimum )
+        return Minimum;
+      else if( value > Maximum )
+        return Maximum;
+      else
+        return value;
+    }
+
+    protected override void OnIncrement()
+    {
+      if( Value.HasValue )
+        Value += Increment;
+      else
+        Value = DefaultValue;
+    }
+
+    protected override void OnDecrement()
     {
-        #region Constructors
-
-        static IntegerUpDown()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(IntegerUpDown), new FrameworkPropertyMetadata(typeof(IntegerUpDown)));
-            DefaultValueProperty.OverrideMetadata(typeof(IntegerUpDown), new FrameworkPropertyMetadata(0));
-            IncrementProperty.OverrideMetadata(typeof(IntegerUpDown), new FrameworkPropertyMetadata(1));
-            MaximumProperty.OverrideMetadata(typeof(IntegerUpDown), new FrameworkPropertyMetadata(int.MaxValue));
-            MinimumProperty.OverrideMetadata(typeof(IntegerUpDown), new FrameworkPropertyMetadata(int.MinValue));
-        }
-
-        #endregion //Constructors
-
-        #region Base Class Overrides
-
-        protected override int? CoerceValue(int? value)
-        {
-            if (value < Minimum)
-                return Minimum;
-            else if (value > Maximum)
-                return Maximum;
-            else
-                return value;
-        }
-
-        protected override void OnIncrement()
-        {
-            if (Value.HasValue)
-                Value += Increment;
-            else
-                Value = DefaultValue;
-        }
-
-        protected override void OnDecrement()
-        {
-            if (Value.HasValue)
-                Value -= Increment;
-            else
-                Value = DefaultValue;
-        }
-
-        protected override int? ConvertTextToValue(string text)
-        {
-            int? result = null;
-
-            if (String.IsNullOrEmpty(text))
-                return result;
-
-            try
-            {
-                //don't know why someone would format an integer as %, but just in case they do.
-                result = FormatString.Contains("P") ? Decimal.ToInt32(ParsePercent(text, CultureInfo)) : ParseInt(text, CultureInfo);
-                result = CoerceValue(result);
-            }
-            catch
-            {
-                Text = ConvertValueToText();
-                return Value;
-            }
-
-            return result;
-        }
-
-        protected override string ConvertValueToText()
-        {
-            if (Value == null)
-                return string.Empty;
-
-            return Value.Value.ToString(FormatString, CultureInfo);
-        }
-
-        protected override void SetValidSpinDirection()
-        {
-            ValidSpinDirections validDirections = ValidSpinDirections.None;
-
-            if (Value < Maximum || !Value.HasValue)
-                validDirections = validDirections | ValidSpinDirections.Increase;
-
-            if (Value > Minimum || !Value.HasValue)
-                validDirections = validDirections | ValidSpinDirections.Decrease;
-
-            if (Spinner != null)
-                Spinner.ValidSpinDirection = validDirections;
-        }
-
-        protected override void ValidateValue(int? value)
-        {
-            if (value < Minimum)
-                Value = Minimum;
-            else if (value > Maximum)
-                Value = Maximum;
-        }
-
-        #endregion //Base Class Overrides
+      if( Value.HasValue )
+        Value -= Increment;
+      else
+        Value = DefaultValue;
     }
+
+    protected override int? ConvertTextToValue( string text )
+    {
+      int? result = null;
+
+      if( String.IsNullOrEmpty( text ) )
+        return result;
+
+      try
+      {
+        //don't know why someone would format an integer as %, but just in case they do.
+        result = FormatString.Contains( "P" ) ? Decimal.ToInt32( ParsePercent( text, CultureInfo ) ) : ParseInt( text, CultureInfo );
+        result = CoerceValue( result );
+      }
+      catch
+      {
+        Text = ConvertValueToText();
+        return Value;
+      }
+
+      return result;
+    }
+
+    protected override string ConvertValueToText()
+    {
+      if( Value == null )
+        return string.Empty;
+
+      return Value.Value.ToString( FormatString, CultureInfo );
+    }
+
+    protected override void SetValidSpinDirection()
+    {
+      ValidSpinDirections validDirections = ValidSpinDirections.None;
+
+      if( Value < Maximum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Increase;
+
+      if( Value > Minimum || !Value.HasValue )
+        validDirections = validDirections | ValidSpinDirections.Decrease;
+
+      if( Spinner != null )
+        Spinner.ValidSpinDirection = validDirections;
+    }
+
+    protected override void ValidateValue( int? value )
+    {
+      if( value < Minimum )
+        Value = Minimum;
+      else if( value > Maximum )
+        Value = Maximum;
+    }
+
+    #endregion //Base Class Overrides
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs
index 84bd6e81..0f6ac20c 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Implementation/NumericUpDown.cs
@@ -1,149 +1,202 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
+using System.Globalization;
 using System.Windows;
-using System.Windows.Input;
 using Microsoft.Windows.Controls.Primitives;
-using System.Globalization;
 
 namespace Microsoft.Windows.Controls
 {
-    public abstract class NumericUpDown<T> : UpDownBase<T>
-    {
-        #region Properties
-
-        #region DefaultValue
-
-        public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register("DefaultValue", typeof(T), typeof(NumericUpDown<T>), new UIPropertyMetadata(default(T)));
-        public T DefaultValue
-        {
-            get { return (T)GetValue(DefaultValueProperty); }
-            set { SetValue(DefaultValueProperty, value); }
-        }
+  public abstract class NumericUpDown<T> : UpDownBase<T>
+  {
+    #region Properties
 
-        #endregion //DefaultValue
+    #region DefaultValue
 
-        #region FormatString
+    public static readonly DependencyProperty DefaultValueProperty = DependencyProperty.Register( "DefaultValue", typeof( T ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( default( T ) ) );
+    public T DefaultValue
+    {
+      get
+      {
+        return ( T )GetValue( DefaultValueProperty );
+      }
+      set
+      {
+        SetValue( DefaultValueProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register("FormatString", typeof(string), typeof(NumericUpDown<T>), new UIPropertyMetadata(String.Empty, OnFormatStringChanged));
-        public string FormatString
-        {
-            get { return (string)GetValue(FormatStringProperty); }
-            set { SetValue(FormatStringProperty, value); }
-        }
-
-        private static void OnFormatStringChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
-            if (numericUpDown != null)
-                numericUpDown.OnFormatStringChanged((string)e.OldValue, (string)e.NewValue);
-        }
+    #endregion //DefaultValue
 
-        protected virtual void OnFormatStringChanged(string oldValue, string newValue)
-        {
-            if (IsInitialized)
-                Text = ConvertValueToText();
-        }
+    #region FormatString
 
-        #endregion //FormatString
+    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( String.Empty, OnFormatStringChanged ) );
+    public string FormatString
+    {
+      get
+      {
+        return ( string )GetValue( FormatStringProperty );
+      }
+      set
+      {
+        SetValue( FormatStringProperty, value );
+      }
+    }
+
+    private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
+      if( numericUpDown != null )
+        numericUpDown.OnFormatStringChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
+
+    protected virtual void OnFormatStringChanged( string oldValue, string newValue )
+    {
+      if( IsInitialized )
+        Text = ConvertValueToText();
+    }
 
-        #region Increment
+    #endregion //FormatString
 
-        public static readonly DependencyProperty IncrementProperty = DependencyProperty.Register("Increment", typeof(T), typeof(NumericUpDown<T>), new PropertyMetadata(default(T)));
-        public T Increment
-        {
-            get { return (T)GetValue(IncrementProperty); }
-            set { SetValue(IncrementProperty, value); }
-        }
+    #region Increment
 
-        #endregion
+    public static readonly DependencyProperty IncrementProperty = DependencyProperty.Register( "Increment", typeof( T ), typeof( NumericUpDown<T> ), new PropertyMetadata( default( T ) ) );
+    public T Increment
+    {
+      get
+      {
+        return ( T )GetValue( IncrementProperty );
+      }
+      set
+      {
+        SetValue( IncrementProperty, value );
+      }
+    }
 
-        #region Maximum
+    #endregion
 
-        public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register("Maximum", typeof(T), typeof(NumericUpDown<T>), new UIPropertyMetadata(default(T), OnMaximumChanged));
-        public T Maximum
-        {
-            get { return (T)GetValue(MaximumProperty); }
-            set { SetValue(MaximumProperty, value); }
-        }
+    #region Maximum
 
-        private static void OnMaximumChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
-            if (numericUpDown != null)
-                numericUpDown.OnMaximumChanged((T)e.OldValue, (T)e.NewValue);
-        }
+    public static readonly DependencyProperty MaximumProperty = DependencyProperty.Register( "Maximum", typeof( T ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( default( T ), OnMaximumChanged ) );
+    public T Maximum
+    {
+      get
+      {
+        return ( T )GetValue( MaximumProperty );
+      }
+      set
+      {
+        SetValue( MaximumProperty, value );
+      }
+    }
 
-        protected virtual void OnMaximumChanged(T oldValue, T newValue)
-        {
-            SetValidSpinDirection();
-        }
+    private static void OnMaximumChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
+      if( numericUpDown != null )
+        numericUpDown.OnMaximumChanged( ( T )e.OldValue, ( T )e.NewValue );
+    }
 
-        #endregion //Maximum
+    protected virtual void OnMaximumChanged( T oldValue, T newValue )
+    {
+      SetValidSpinDirection();
+    }
 
-        #region Minimum
+    #endregion //Maximum
 
-        public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register("Minimum", typeof(T), typeof(NumericUpDown<T>), new UIPropertyMetadata(default(T), OnMinimumChanged));
-        public T Minimum
-        {
-            get { return (T)GetValue(MinimumProperty); }
-            set { SetValue(MinimumProperty, value); }
-        }
+    #region Minimum
 
-        private static void OnMinimumChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
-            if (numericUpDown != null)
-                numericUpDown.OnMinimumChanged((T)e.OldValue, (T)e.NewValue);
-        }
+    public static readonly DependencyProperty MinimumProperty = DependencyProperty.Register( "Minimum", typeof( T ), typeof( NumericUpDown<T> ), new UIPropertyMetadata( default( T ), OnMinimumChanged ) );
+    public T Minimum
+    {
+      get
+      {
+        return ( T )GetValue( MinimumProperty );
+      }
+      set
+      {
+        SetValue( MinimumProperty, value );
+      }
+    }
 
-        protected virtual void OnMinimumChanged(T oldValue, T newValue)
-        {
-            SetValidSpinDirection();
-        }
+    private static void OnMinimumChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      NumericUpDown<T> numericUpDown = o as NumericUpDown<T>;
+      if( numericUpDown != null )
+        numericUpDown.OnMinimumChanged( ( T )e.OldValue, ( T )e.NewValue );
+    }
 
-        #endregion //Minimum
+    protected virtual void OnMinimumChanged( T oldValue, T newValue )
+    {
+      SetValidSpinDirection();
+    }
 
-        #region SelectAllOnGotFocus
+    #endregion //Minimum
 
-        public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register("SelectAllOnGotFocus", typeof(bool), typeof(NumericUpDown<T>), new PropertyMetadata(false));
-        public bool SelectAllOnGotFocus
-        {
-            get { return (bool)GetValue(SelectAllOnGotFocusProperty); }
-            set { SetValue(SelectAllOnGotFocusProperty, value); }
-        }
+    #region SelectAllOnGotFocus
 
-        #endregion //SelectAllOnGotFocus
+    public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register( "SelectAllOnGotFocus", typeof( bool ), typeof( NumericUpDown<T> ), new PropertyMetadata( false ) );
+    public bool SelectAllOnGotFocus
+    {
+      get
+      {
+        return ( bool )GetValue( SelectAllOnGotFocusProperty );
+      }
+      set
+      {
+        SetValue( SelectAllOnGotFocusProperty, value );
+      }
+    }
 
-        #endregion //Properties
+    #endregion //SelectAllOnGotFocus
 
-        #region Methods
+    #endregion //Properties
 
-        protected static decimal ParseDecimal(string text, IFormatProvider cultureInfo)
-        {
-            return Decimal.Parse(text, NumberStyles.Any, cultureInfo);
-        }
+    #region Methods
 
-        protected static double ParseDouble(string text, IFormatProvider cultureInfo)
-        {
-            return Double.Parse(text, NumberStyles.Any, cultureInfo);
-        }
+    protected static decimal ParseDecimal( string text, IFormatProvider cultureInfo )
+    {
+      return Decimal.Parse( text, NumberStyles.Any, cultureInfo );
+    }
 
-        protected static int ParseInt(string text, IFormatProvider cultureInfo)
-        {
-            return Int32.Parse(text, NumberStyles.Any, cultureInfo);
-        }
+    protected static double ParseDouble( string text, IFormatProvider cultureInfo )
+    {
+      return Double.Parse( text, NumberStyles.Any, cultureInfo );
+    }
 
-        protected static decimal ParsePercent(string text, IFormatProvider cultureInfo)
-        {
-            NumberFormatInfo info = NumberFormatInfo.GetInstance(cultureInfo);
+    protected static int ParseInt( string text, IFormatProvider cultureInfo )
+    {
+      return Int32.Parse( text, NumberStyles.Any, cultureInfo );
+    }
 
-            text = text.Replace(info.PercentSymbol, null);
+    protected static decimal ParsePercent( string text, IFormatProvider cultureInfo )
+    {
+      NumberFormatInfo info = NumberFormatInfo.GetInstance( cultureInfo );
 
-            decimal result = Decimal.Parse(text, NumberStyles.Any, info);
-            result = result / 100;
+      text = text.Replace( info.PercentSymbol, null );
 
-            return result;
-        }
+      decimal result = Decimal.Parse( text, NumberStyles.Any, info );
+      result = result / 100;
 
-        #endregion //Methods
+      return result;
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
index b35c0fc2..69a74190 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
@@ -1,84 +1,108 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters"
                     xmlns:prims="clr-namespace:Microsoft.Windows.Controls.Primitives">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
-    </DataTemplate>
-    
-    <Style x:Key="NumericUpDown" TargetType="Control">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Right" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Control">
-                    <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
-                                         AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}" ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}">
-                        <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0"
-                                                Background="Transparent"
-                                                ContextMenu="{TemplateBinding ContextMenu}"
-                                                FontFamily="{TemplateBinding FontFamily}" 
-                                                FontSize="{TemplateBinding FontSize}" 
-                                                FontStretch="{TemplateBinding FontStretch}"
-                                                FontStyle="{TemplateBinding FontStyle}" 
-                                                FontWeight="{TemplateBinding FontWeight}" 
-                                                Foreground="{TemplateBinding Foreground}" 
-                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                                                MinWidth="20" AcceptsReturn="False"
-                                                Padding="0"
-                                                SelectAllOnGotFocus="{Binding SelectAllOnGotFocus, RelativeSource={RelativeSource TemplatedParent}}"
-                                                TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
-                                                TextWrapping="NoWrap" 
-                                                TabIndex="{TemplateBinding TabIndex}"
-                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                Watermark="{Binding Watermark, RelativeSource={RelativeSource TemplatedParent}}"
-                                                WatermarkTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}}"/>
-                    </local:ButtonSpinner>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- =============================================================================== -->
-    <!-- DecimalUpDown                                                                   -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:DecimalUpDown}" BasedOn="{StaticResource NumericUpDown}">
-        <Setter Property="TextAlignment" Value="Right" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-    </Style>
-
-    <!-- =============================================================================== -->
-    <!-- DoubleUpDown                                                                    -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:DoubleUpDown}" BasedOn="{StaticResource NumericUpDown}">
-        <Setter Property="TextAlignment" Value="Right" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-    </Style>
-
-    <!-- =============================================================================== -->
-    <!-- IntegerUpDown                                                                   -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:IntegerUpDown}" BasedOn="{StaticResource NumericUpDown}">
-        <Setter Property="TextAlignment" Value="Right" />        
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-    </Style>
-   
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <Style x:Key="NumericUpDown" TargetType="Control">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Control">
+               <local:ButtonSpinner x:Name="Spinner"
+                                    IsTabStop="False"
+                                    Background="{TemplateBinding Background}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}"
+                                    ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}">
+                  <local:WatermarkTextBox x:Name="TextBox"
+                                          BorderThickness="0"
+                                          Background="Transparent"
+                                          ContextMenu="{TemplateBinding ContextMenu}"
+                                          FontFamily="{TemplateBinding FontFamily}" 
+                                          FontSize="{TemplateBinding FontSize}" 
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}" 
+                                          FontWeight="{TemplateBinding FontWeight}" 
+                                          Foreground="{TemplateBinding Foreground}" 
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="0"
+                                          SelectAllOnGotFocus="{Binding SelectAllOnGotFocus, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TextWrapping="NoWrap" 
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Watermark="{Binding Watermark, RelativeSource={RelativeSource TemplatedParent}}"
+                                          WatermarkTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}}" />
+               </local:ButtonSpinner>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- DecimalUpDown                                                                   -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DecimalUpDown}" BasedOn="{StaticResource NumericUpDown}">
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- DoubleUpDown                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DoubleUpDown}" BasedOn="{StaticResource NumericUpDown}">
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- IntegerUpDown                                                                   -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:IntegerUpDown}" BasedOn="{StaticResource NumericUpDown}">
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+   </Style>
+
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs
index fa86c5c4..0061256b 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs
@@ -1,23 +1,39 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using System.Security;
 using System.Windows;
 using System.Windows.Markup;
-using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Extended WPF Toolkit")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Extended WPF Toolkit")]
-[assembly: AssemblyCopyright("Copyright ©  2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Extended WPF Toolkit" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "" )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit" )]
+[assembly: AssemblyCopyright( "Copyright ©  2010" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Needed to enable xbap scenarios
 [assembly: AllowPartiallyTrustedCallers]
@@ -26,9 +42,9 @@ using System.Security;
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
-[assembly: CLSCompliant(true)]
+[assembly: CLSCompliant( true )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -42,11 +58,11 @@ using System.Security;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -60,9 +76,9 @@ using System.Security;
 // 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("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion( "1.6.0.0" )]
+[assembly: AssemblyFileVersion( "1.6.0.0" )]
 
-[assembly: XmlnsPrefix("http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "extToolkit")]
-[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "Microsoft.Windows.Controls")]
-[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "Microsoft.Windows.Controls.PropertyGrid")]
+[assembly: XmlnsPrefix( "http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "extToolkit" )]
+[assembly: XmlnsDefinition( "http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "Microsoft.Windows.Controls" )]
+[assembly: XmlnsDefinition( "http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "Microsoft.Windows.Controls.PropertyGrid" )]
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
index bbf9219f..09efe50c 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ExpandableObjectAttribute.cs
@@ -1,12 +1,29 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Attributes
 {
-    public class ExpandableObjectAttribute : Attribute
+  public class ExpandableObjectAttribute : Attribute
+  {
+    public ExpandableObjectAttribute()
     {
-        public ExpandableObjectAttribute()
-        {
-
-        }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs
index ae017ae5..31ca71a9 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/IItemsSource.cs
@@ -1,36 +1,61 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Collections.Generic;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Attributes
 {
-    public interface IItemsSource
+  public interface IItemsSource
+  {
+    ItemCollection GetValues();
+  }
+
+  public class Item
+  {
+    public string DisplayName
     {
-        ItemCollection GetValues();
+      get;
+      set;
     }
-
-    public class Item
+    public object Value
     {
-        public string DisplayName { get; set; }
-        public object Value { get; set; }        
+      get;
+      set;
     }
+  }
 
-    public class ItemCollection : List<Item>
+  public class ItemCollection : List<Item>
+  {
+    public void Add( object value )
     {
-        public void Add(object value)
-        {
-            Item item = new Item();
-            item.DisplayName = value.ToString();
-            item.Value = value;
-            base.Add(item);
-        }
-
-        public void Add(object value, string displayName)
-        {
-            Item newItem = new Item();
-            newItem.DisplayName = displayName;
-            newItem.Value = value;
-            base.Add(newItem);
-        }
+      Item item = new Item();
+      item.DisplayName = value.ToString();
+      item.Value = value;
+      base.Add( item );
+    }
 
+    public void Add( object value, string displayName )
+    {
+      Item newItem = new Item();
+      newItem.DisplayName = displayName;
+      newItem.Value = value;
+      base.Add( newItem );
     }
+
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
index 1aff8157..ca76cb9e 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/ItemsSourceAttribute.cs
@@ -1,18 +1,40 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Attributes
 {
-    public class ItemsSourceAttribute : Attribute
+  public class ItemsSourceAttribute : Attribute
+  {
+    public Type Type
     {
-        public Type Type { get; set; }
+      get;
+      set;
+    }
 
-        public ItemsSourceAttribute(Type type)
-        {
-            var valueSourceInterface = type.GetInterface("Microsoft.Windows.Controls.PropertyGrid.Attributes.IItemsSource");
-            if (valueSourceInterface == null)
-                throw new ArgumentException("Type must implement the IItemsSource interface.", "type");
+    public ItemsSourceAttribute( Type type )
+    {
+      var valueSourceInterface = type.GetInterface( "Microsoft.Windows.Controls.PropertyGrid.Attributes.IItemsSource" );
+      if( valueSourceInterface == null )
+        throw new ArgumentException( "Type must implement the IItemsSource interface.", "type" );
 
-            Type = type;
-        }
+      Type = type;
     }
+  }
 }
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
index 1b4bb95b..4db4a5c8 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Attributes/PropertyOrderAttribute.cs
@@ -1,15 +1,37 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Attributes
 {
-    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
-    public class PropertyOrderAttribute : Attribute
+  [AttributeUsage( AttributeTargets.Property, AllowMultiple = false, Inherited = true )]
+  public class PropertyOrderAttribute : Attribute
+  {
+    public int Order
+    {
+      get;
+      set;
+    }
+
+    public PropertyOrderAttribute( int order )
     {
-        public int Order { get; set; }
-        
-        public PropertyOrderAttribute(int order)
-        {
-            Order = order;
-        }
+      Order = order;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
index 4291ed48..9aace178 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyGridCommands.cs
@@ -1,17 +1,34 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Commands
 {
-    public class PropertyGridCommands
+  public class PropertyGridCommands
+  {
+    private static RoutedCommand _clearFilterCommand = new RoutedCommand();
+    public static RoutedCommand ClearFilter
     {
-        private static RoutedCommand _clearFilterCommand = new RoutedCommand();
-        public static RoutedCommand ClearFilter
-        {
-            get
-            {
-                return _clearFilterCommand;
-            }
-        }
+      get
+      {
+        return _clearFilterCommand;
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
index f1db5ce6..ec46010a 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Commands/PropertyItemCommands.cs
@@ -1,17 +1,34 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Commands
 {
-    public static class PropertyItemCommands
+  public static class PropertyItemCommands
+  {
+    private static RoutedCommand _resetValueCommand = new RoutedCommand();
+    public static RoutedCommand ResetValue
     {
-        private static RoutedCommand _resetValueCommand = new RoutedCommand();
-        public static RoutedCommand ResetValue
-        {
-            get
-            {
-                return _resetValueCommand;
-            }
-        }
+      get
+      {
+        return _resetValueCommand;
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
index 4b8164ad..039a76e4 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ExpandableObjectMarginConverter.cs
@@ -1,20 +1,38 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System;
 using System.Windows;
 using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Converters
 {
-    public class ExpandableObjectMarginConverter : IValueConverter
+  public class ExpandableObjectMarginConverter : IValueConverter
+  {
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      int childLevel = ( int )value;
+      return new Thickness( childLevel * 15, 0, 0, 0 );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            int childLevel = (int)value;
-            return new Thickness(childLevel * 15, 0, 0, 0);
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
+      throw new NotImplementedException();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs
index 51aadbb7..0cdcad11 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToImagePathConverter.cs
@@ -1,48 +1,66 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Media.Imaging;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Converters
 {
-    public class ValueSourceToImagePathConverter : IValueConverter
+  public class ValueSourceToImagePathConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      BaseValueSource bvs = ( BaseValueSource )value;
+
+      string uriPrefix = "/WPFToolkit.Extended;component/PropertyGrid/Images/";
+      string imageName = "AdvancedProperties11";
+
+      switch( bvs )
+      {
+        case BaseValueSource.Inherited:
+        case BaseValueSource.DefaultStyle:
+        case BaseValueSource.ImplicitStyleReference:
+          imageName = "Inheritance11";
+          break;
+        case BaseValueSource.DefaultStyleTrigger:
+          break;
+        case BaseValueSource.Style:
+          imageName = "Style11";
+          break;
+
+        case BaseValueSource.Local:
+          imageName = "Local11";
+          break;
+      }
+
+
+      return new BitmapImage( new Uri( String.Format( "{0}{1}.png", uriPrefix, imageName ), UriKind.RelativeOrAbsolute ) );
+    }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
-        #region IValueConverter Members
-
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            BaseValueSource bvs = (BaseValueSource)value;
-
-            string uriPrefix = "/WPFToolkit.Extended;component/PropertyGrid/Images/";
-            string imageName = "AdvancedProperties11";
-
-            switch (bvs)
-            {
-                case BaseValueSource.Inherited:
-                case BaseValueSource.DefaultStyle:
-                case BaseValueSource.ImplicitStyleReference:
-                    imageName = "Inheritance11";
-                    break;
-                case BaseValueSource.DefaultStyleTrigger:                    
-                    break;
-                case BaseValueSource.Style:
-                    imageName = "Style11";
-                    break;
-
-                case BaseValueSource.Local:
-                    imageName = "Local11";
-                    break;
-            }
-
-
-            return new BitmapImage(new Uri(String.Format("{0}{1}.png", uriPrefix, imageName), UriKind.RelativeOrAbsolute));
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-
-        #endregion
+      throw new NotImplementedException();
     }
+
+    #endregion
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs
index 2549d84d..fd4493df 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Converters/ValueSourceToToolTipConverter.cs
@@ -1,42 +1,60 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Converters
 {
-    public class ValueSourceToToolTipConverter : IValueConverter
+  public class ValueSourceToToolTipConverter : IValueConverter
+  {
+    #region IValueConverter Members
+
+    public object Convert( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
     {
-        #region IValueConverter Members
-
-        public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            BaseValueSource bvs = (BaseValueSource)value;
-            string toolTip = "Advanced Properties";
-
-            switch (bvs)
-            {
-                case BaseValueSource.Inherited:
-                case BaseValueSource.DefaultStyle:
-                case BaseValueSource.ImplicitStyleReference:
-                    toolTip = "Inheritance";
-                    break;
-                case BaseValueSource.Style:
-                    toolTip = "Style Setter";
-                    break;
-
-                case BaseValueSource.Local:
-                    toolTip = "Local";
-                    break;
-            }
-
-            return toolTip;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-
-        #endregion
+      BaseValueSource bvs = ( BaseValueSource )value;
+      string toolTip = "Advanced Properties";
+
+      switch( bvs )
+      {
+        case BaseValueSource.Inherited:
+        case BaseValueSource.DefaultStyle:
+        case BaseValueSource.ImplicitStyleReference:
+          toolTip = "Inheritance";
+          break;
+        case BaseValueSource.Style:
+          toolTip = "Style Setter";
+          break;
+
+        case BaseValueSource.Local:
+          toolTip = "Local";
+          break;
+      }
+
+      return toolTip;
     }
+
+    public object ConvertBack( object value, Type targetType, object parameter, System.Globalization.CultureInfo culture )
+    {
+      throw new NotImplementedException();
+    }
+
+    #endregion
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs
index 89d03a1f..e2145060 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinition.cs
@@ -1,19 +1,51 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 
 namespace Microsoft.Windows.Controls.PropertyGrid
 {
-    public class EditorDefinition
+  public class EditorDefinition
+  {
+    public DataTemplate EditorTemplate
     {
-        public DataTemplate EditorTemplate { get; set; }
+      get;
+      set;
+    }
 
-        private PropertyDefinitionCollection _properties = new PropertyDefinitionCollection();
-        public PropertyDefinitionCollection PropertiesDefinitions
-        {
-            get { return _properties; }
-            set { _properties = value; }
-        }
+    private PropertyDefinitionCollection _properties = new PropertyDefinitionCollection();
+    public PropertyDefinitionCollection PropertiesDefinitions
+    {
+      get
+      {
+        return _properties;
+      }
+      set
+      {
+        _properties = value;
+      }
+    }
 
-        public Type TargetType { get; set; }
+    public Type TargetType
+    {
+      get;
+      set;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs
index 8d0d37ad..39889ee1 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/EditorDefinitionCollection.cs
@@ -1,37 +1,55 @@
-using System;
-using System.Linq;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Collections.ObjectModel;
+using System.Linq;
 
 namespace Microsoft.Windows.Controls.PropertyGrid
 {
-    public class EditorDefinitionCollection : ObservableCollection<EditorDefinition>
+  public class EditorDefinitionCollection : ObservableCollection<EditorDefinition>
+  {
+    public EditorDefinition this[ string propertyName ]
     {
-        public EditorDefinition this[string propertyName]
+      get
+      {
+        foreach( var item in Items )
         {
-            get
-            {
-                foreach (var item in Items)
-                {
-                    if (item.PropertiesDefinitions.Where(x => x.Name == propertyName).Any())
-                        return item;
-                }
-
-                return null;
-            }
+          if( item.PropertiesDefinitions.Where( x => x.Name == propertyName ).Any() )
+            return item;
         }
 
-        public EditorDefinition this[Type targetType]
+        return null;
+      }
+    }
+
+    public EditorDefinition this[ Type targetType ]
+    {
+      get
+      {
+        foreach( var item in Items )
         {
-            get
-            {
-                foreach (var item in Items)
-                {
-                    if (item.TargetType == targetType)
-                        return item;
-                }
-
-                return null;
-            }
+          if( item.TargetType == targetType )
+            return item;
         }
+
+        return null;
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
index 90e4ec02..fa55237a 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CheckBoxEditor.cs
@@ -1,18 +1,36 @@
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Windows;
 using System.Windows.Controls;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public class CheckBoxEditor : TypeEditor<CheckBox>
+  public class CheckBoxEditor : TypeEditor<CheckBox>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.Margin = new Thickness( 5, 0, 0, 0 );
+    }
+
+    protected override void SetValueDependencyProperty()
     {
-        protected override void SetControlProperties()
-        {
-            Editor.Margin = new Thickness(5, 0, 0, 0);
-        }
-
-        protected override void SetValueDependencyProperty()
-        {
-            ValueProperty = CheckBox.IsCheckedProperty;
-        }
+      ValueProperty = CheckBox.IsCheckedProperty;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml
index 626b818c..94361853 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml
@@ -1,50 +1,75 @@
-<UserControl x:Class="Microsoft.Windows.Controls.PropertyGrid.Editors.CollectionEditor"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<UserControl x:Class="Microsoft.Windows.Controls.PropertyGrid.Editors.CollectionEditor"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes" >
-
-    <UserControl.Resources>
-        <Style x:Key="ButtonStyle" TargetType="Button">
-            <Setter Property="Background" Value="White"/>
-            <Setter Property="BorderThickness" Value="0" />
-            <Setter Property="Padding" Value="2,0,0,0" />
-            <Setter Property="HorizontalContentAlignment" Value="Left" />
-            <Setter Property="VerticalContentAlignment" Value="Center" />
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="Button">
-                        <Grid SnapsToDevicePixels="True">
-
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-
-                                <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-                                    <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-                                </Border>
-
-                                <chrome:ButtonChrome x:Name="ToggleButtonChrome" Grid.Column="1"
+             xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes">
+
+   <UserControl.Resources>
+      <Style x:Key="ButtonStyle" TargetType="Button">
+         <Setter Property="Background" Value="White" />
+         <Setter Property="BorderThickness" Value="0" />
+         <Setter Property="Padding" Value="2,0,0,0" />
+         <Setter Property="HorizontalContentAlignment" Value="Left" />
+         <Setter Property="VerticalContentAlignment" Value="Center" />
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="Button">
+                  <Grid SnapsToDevicePixels="True">
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                           <ContentPresenter Content="{TemplateBinding Content}"
+                                             ContentTemplate="{TemplateBinding ContentTemplate}"
+                                             ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        </Border>
+
+                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                             Grid.Column="1"
                                              CornerRadius="0,2.75,2.75,0"
-                                            RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
-											RenderMouseOver="{TemplateBinding IsMouseOver}" >
-
-                                    <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
-                                        <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                    </Grid>
-                                </chrome:ButtonChrome>
-                            </Grid>
-
-                        </Grid>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-    </UserControl.Resources>
-
-    <Button Grid.Column="1" IsTabStop="True" MinHeight="22" SnapsToDevicePixels="True"
-            Content="(Collection)"
-            Style="{StaticResource ButtonStyle}" Click="Button_Click" />
+                                             RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=UserControl}}"
+											            RenderMouseOver="{TemplateBinding IsMouseOver}">
+                           <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                              <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                           </Grid>
+                        </chrome:ButtonChrome>
+                     </Grid>
+
+                  </Grid>
+               </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+   </UserControl.Resources>
+
+   <Button Grid.Column="1"
+           IsTabStop="True"
+           MinHeight="22"
+           SnapsToDevicePixels="True"
+           Content="(Collection)"
+           Style="{StaticResource ButtonStyle}"
+           Click="Button_Click" />
 </UserControl>
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs
index 6dd3407d..f4ec1279 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/CollectionEditor.xaml.cs
@@ -1,36 +1,53 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    /// <summary>
-    /// Interaction logic for CollectionEditor.xaml
-    /// </summary>
-    public partial class CollectionEditor : UserControl, ITypeEditor
+  /// <summary>
+  /// Interaction logic for CollectionEditor.xaml
+  /// </summary>
+  public partial class CollectionEditor : UserControl, ITypeEditor
+  {
+    PropertyItem _item;
+
+    public CollectionEditor()
+    {
+      InitializeComponent();
+    }
+
+    private void Button_Click( object sender, RoutedEventArgs e )
+    {
+      CollectionEditorDialog editor = new CollectionEditorDialog( _item.PropertyType );
+      Binding binding = new Binding( "Value" );
+      binding.Source = _item;
+      binding.Mode = _item.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+      BindingOperations.SetBinding( editor, CollectionEditorDialog.ItemsSourceProperty, binding );
+      editor.ShowDialog();
+    }
+
+    public FrameworkElement ResolveEditor( PropertyItem propertyItem )
     {
-        PropertyItem _item;
-
-        public CollectionEditor()
-        {
-            InitializeComponent();
-        }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            CollectionEditorDialog editor = new CollectionEditorDialog(_item.PropertyType);
-            Binding binding = new Binding("Value");
-            binding.Source = _item;
-            binding.Mode = _item.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
-            BindingOperations.SetBinding(editor, CollectionEditorDialog.ItemsSourceProperty, binding);
-            editor.ShowDialog();
-        }
-
-        public FrameworkElement ResolveEditor(PropertyItem propertyItem)
-        {
-            _item = propertyItem;
-            return this;
-        }
+      _item = propertyItem;
+      return this;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs
index 13ac99b1..4d467fa1 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ColorEditor.cs
@@ -1,17 +1,34 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public class ColorEditor : TypeEditor<ColorPicker>
+  public class ColorEditor : TypeEditor<ColorPicker>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+      Editor.DisplayColorAndName = true;
+    }
+    protected override void SetValueDependencyProperty()
     {
-        protected override void SetControlProperties()
-        {
-            Editor.BorderThickness = new System.Windows.Thickness(0);
-            Editor.DisplayColorAndName = true;
-        }
-        protected override void SetValueDependencyProperty()
-        {
-            ValueProperty = ColorPicker.SelectedColorProperty;
-        }
+      ValueProperty = ColorPicker.SelectedColorProperty;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
index 12632cca..c3edce70 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ComboBoxEditor.cs
@@ -1,26 +1,43 @@
-using System.Collections.Generic;
-using System.Windows.Controls;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Collections.Generic;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public abstract class ComboBoxEditor : TypeEditor<System.Windows.Controls.ComboBox>
+  public abstract class ComboBoxEditor : TypeEditor<System.Windows.Controls.ComboBox>
+  {
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = System.Windows.Controls.ComboBox.SelectedItemProperty;
+    }
+
+    protected override void ResolveValueBinding( PropertyItem propertyItem )
+    {
+      SetItemsSource( propertyItem );
+      base.ResolveValueBinding( propertyItem );
+    }
+
+    protected abstract IList<object> CreateItemsSource( PropertyItem propertyItem );
+
+    private void SetItemsSource( PropertyItem propertyItem )
     {
-        protected override void SetValueDependencyProperty()
-        {
-            ValueProperty = System.Windows.Controls.ComboBox.SelectedItemProperty;
-        }
-
-        protected override void ResolveValueBinding(PropertyItem propertyItem)
-        {
-            SetItemsSource(propertyItem);
-            base.ResolveValueBinding(propertyItem);
-        }
-
-        protected abstract IList<object> CreateItemsSource(PropertyItem propertyItem);
-
-        private void SetItemsSource(PropertyItem propertyItem)
-        {
-            Editor.ItemsSource = CreateItemsSource(propertyItem);
-        }
+      Editor.ItemsSource = CreateItemsSource( propertyItem );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs
index 53cb613d..95838cea 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DateTimeUpDownEditor.cs
@@ -1,16 +1,33 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public class DateTimeUpDownEditor : TypeEditor<DateTimeUpDown>
+  public class DateTimeUpDownEditor : TypeEditor<DateTimeUpDown>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+    protected override void SetValueDependencyProperty()
     {
-        protected override void SetControlProperties()
-        {
-            Editor.BorderThickness = new System.Windows.Thickness(0);
-        }
-        protected override void SetValueDependencyProperty()
-        {
-            ValueProperty = DateTimeUpDown.ValueProperty;
-        }
+      ValueProperty = DateTimeUpDown.ValueProperty;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs
index 5f4c69c6..22743620 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DecimalUpDownEditor.cs
@@ -1,17 +1,34 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public class DecimalUpDownEditor : TypeEditor<DecimalUpDown>
+  public class DecimalUpDownEditor : TypeEditor<DecimalUpDown>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+
+    protected override void SetValueDependencyProperty()
     {
-        protected override void SetControlProperties()
-        {
-            Editor.BorderThickness = new System.Windows.Thickness(0);
-        }
-
-        protected override void SetValueDependencyProperty()
-        {
-            ValueProperty = DecimalUpDown.ValueProperty;
-        }
+      ValueProperty = DecimalUpDown.ValueProperty;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs
index ccace41e..930d47d8 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/DoubleUpDownEditor.cs
@@ -1,17 +1,34 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public class DoubleUpDownEditor : TypeEditor<DoubleUpDown>
+  public class DoubleUpDownEditor : TypeEditor<DoubleUpDown>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+
+    protected override void SetValueDependencyProperty()
     {
-        protected override void SetControlProperties()
-        {
-            Editor.BorderThickness = new System.Windows.Thickness(0);
-        }
-
-        protected override void SetValueDependencyProperty()
-        {
-            ValueProperty = DoubleUpDown.ValueProperty;
-        }
+      ValueProperty = DoubleUpDown.ValueProperty;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
index c79a0e29..d4c72424 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/EnumComboBoxEditor.cs
@@ -1,38 +1,57 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Reflection;
-using System.ComponentModel;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public class EnumComboBoxEditor : ComboBoxEditor
+  public class EnumComboBoxEditor : ComboBoxEditor
+  {
+    protected override IList<object> CreateItemsSource( PropertyItem propertyItem )
     {
-        protected override IList<object> CreateItemsSource(PropertyItem propertyItem)
-        {
-            return GetValues(propertyItem.PropertyType);
-        }
+      return GetValues( propertyItem.PropertyType );
+    }
 
-        private static object[] GetValues(Type enumType)
+    private static object[] GetValues( Type enumType )
+    {
+      List<object> values = new List<object>();
+
+      var fields = enumType.GetFields().Where( x => x.IsLiteral );
+      foreach( FieldInfo field in fields )
+      {
+        // Get array of BrowsableAttribute attributes
+        object[] attrs = field.GetCustomAttributes( typeof( BrowsableAttribute ), false );
+        if( attrs.Length == 1 )
         {
-            List<object> values = new List<object>();            
-
-            var fields = enumType.GetFields().Where(x => x.IsLiteral);
-            foreach (FieldInfo field in fields)
-            {
-                // Get array of BrowsableAttribute attributes
-                object[] attrs = field.GetCustomAttributes(typeof(BrowsableAttribute), false);
-                if (attrs.Length == 1)
-                {
-                    // If attribute exists and its value is false continue to the next field...
-                    BrowsableAttribute brAttr = (BrowsableAttribute)attrs[0];
-                    if (brAttr.Browsable == false) continue;
-                }
-
-                values.Add(field.GetValue(enumType));
-            }
-
-            return values.ToArray();
+          // If attribute exists and its value is false continue to the next field...
+          BrowsableAttribute brAttr = ( BrowsableAttribute )attrs[ 0 ];
+          if( brAttr.Browsable == false )
+            continue;
         }
+
+        values.Add( field.GetValue( enumType ) );
+      }
+
+      return values.ToArray();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
index 987e45d6..a8be4e4c 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/FontComboBoxEditor.cs
@@ -1,38 +1,56 @@
-using System.Linq;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Collections.Generic;
+using System.Linq;
 using System.Windows;
 using System.Windows.Media;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public class FontComboBoxEditor : ComboBoxEditor
+  public class FontComboBoxEditor : ComboBoxEditor
+  {
+    protected override IList<object> CreateItemsSource( PropertyItem propertyItem )
     {
-        protected override IList<object> CreateItemsSource(PropertyItem propertyItem)
-        {
-            if (propertyItem.PropertyType == typeof(FontFamily))
-                return GetFontFamilies();
-            else if (propertyItem.PropertyType == typeof(FontWeight))
-                return GetFontWeights();
-            else if (propertyItem.PropertyType == typeof(FontStyle))
-                return GetFontStyles();
-            else if (propertyItem.PropertyType == typeof(FontStretch))
-                return GetFontStretches();
+      if( propertyItem.PropertyType == typeof( FontFamily ) )
+        return GetFontFamilies();
+      else if( propertyItem.PropertyType == typeof( FontWeight ) )
+        return GetFontWeights();
+      else if( propertyItem.PropertyType == typeof( FontStyle ) )
+        return GetFontStyles();
+      else if( propertyItem.PropertyType == typeof( FontStretch ) )
+        return GetFontStretches();
 
-            return null;
-        }
+      return null;
+    }
 
-        private static IList<object> GetFontFamilies()
-        {
+    private static IList<object> GetFontFamilies()
+    {
 #if !VS2008
-            return Fonts.SystemFontFamilies.ToList<object>();
+      return Fonts.SystemFontFamilies.ToList<object>();
 #else
-            return Fonts.SystemFontFamilies.Cast<object>().ToList();
+      return Fonts.SystemFontFamilies.Cast<object>().ToList();
 #endif
-        }
+    }
 
-        private static IList<object> GetFontWeights()
-        {
-            return new List<object>()
+    private static IList<object> GetFontWeights()
+    {
+      return new List<object>()
             {
                 FontWeights.Black, 
                 FontWeights.Bold, 
@@ -45,20 +63,20 @@ namespace Microsoft.Windows.Controls.PropertyGrid.Editors
                 FontWeights.SemiBold,
                 FontWeights.Thin
             };
-        }
+    }
 
-        private static IList<object> GetFontStyles()
-        {
-            return new List<object>()
+    private static IList<object> GetFontStyles()
+    {
+      return new List<object>()
             {
                 FontStyles.Italic,
                 FontStyles.Normal
             };
-        }
+    }
 
-        private static IList<object> GetFontStretches()
-        {
-            return new List<object>()
+    private static IList<object> GetFontStretches()
+    {
+      return new List<object>()
             {
                 FontStretches.Condensed,
                 FontStretches.Expanded,
@@ -70,6 +88,6 @@ namespace Microsoft.Windows.Controls.PropertyGrid.Editors
                 FontStretches.UltraCondensed,
                 FontStretches.UltraExpanded
             };
-        }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs
index 9c2bf820..6bb84bb2 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ITypeEditor.cs
@@ -1,9 +1,27 @@
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Windows;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public interface ITypeEditor
-    {
-        FrameworkElement ResolveEditor(PropertyItem propertyItem);
-    }
+  public interface ITypeEditor
+  {
+    FrameworkElement ResolveEditor( PropertyItem propertyItem );
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs
index 631a7788..95cfeeed 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/IntegerUpDownEditor.cs
@@ -1,16 +1,33 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public class IntegerUpDownEditor : TypeEditor<IntegerUpDown>
+  public class IntegerUpDownEditor : TypeEditor<IntegerUpDown>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+    protected override void SetValueDependencyProperty()
     {
-        protected override void SetControlProperties()
-        {
-            Editor.BorderThickness = new System.Windows.Thickness(0);
-        }
-        protected override void SetValueDependencyProperty()
-        {
-            ValueProperty = IntegerUpDown.ValueProperty;
-        }
+      ValueProperty = IntegerUpDown.ValueProperty;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
index f4a2e966..2c413530 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/ItemsSourceAttributeEditor.cs
@@ -1,43 +1,61 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using Microsoft.Windows.Controls.PropertyGrid.Attributes;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public class ItemsSourceAttributeEditor : TypeEditor<System.Windows.Controls.ComboBox>
+  public class ItemsSourceAttributeEditor : TypeEditor<System.Windows.Controls.ComboBox>
+  {
+    private readonly ItemsSourceAttribute _attribute;
+
+    public ItemsSourceAttributeEditor( ItemsSourceAttribute attribute )
+    {
+      _attribute = attribute;
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = System.Windows.Controls.ComboBox.SelectedValueProperty;
+    }
+
+    protected override void ResolveValueBinding( PropertyItem propertyItem )
+    {
+      SetItemsSource();
+      base.ResolveValueBinding( propertyItem );
+    }
+
+    protected override void SetControlProperties()
+    {
+      Editor.DisplayMemberPath = "DisplayName";
+      Editor.SelectedValuePath = "Value";
+    }
+
+    private void SetItemsSource()
+    {
+      Editor.ItemsSource = CreateItemsSource();
+    }
+
+    private System.Collections.IEnumerable CreateItemsSource()
     {
-        private readonly ItemsSourceAttribute _attribute;
-
-        public ItemsSourceAttributeEditor(ItemsSourceAttribute attribute)
-        {
-            _attribute = attribute;
-        }
-
-        protected override void SetValueDependencyProperty()
-        {
-            ValueProperty = System.Windows.Controls.ComboBox.SelectedValueProperty;
-        }
-
-        protected override void ResolveValueBinding(PropertyItem propertyItem)
-        {
-            SetItemsSource();
-            base.ResolveValueBinding(propertyItem);
-        }
-
-        protected override void SetControlProperties()
-        {
-            Editor.DisplayMemberPath = "DisplayName";
-            Editor.SelectedValuePath = "Value";
-        }
-
-        private void SetItemsSource()
-        {
-            Editor.ItemsSource = CreateItemsSource();
-        }
-
-        private System.Collections.IEnumerable CreateItemsSource()
-        {
-            var instance = Activator.CreateInstance(_attribute.Type);
-            return (instance as IItemsSource).GetValues();
-        }
+      var instance = Activator.CreateInstance( _attribute.Type );
+      return ( instance as IItemsSource ).GetValues();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
index 4204d2ae..14635fcf 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/PrimitiveTypeCollectionEditor.cs
@@ -1,25 +1,42 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public class PrimitiveTypeCollectionEditor : TypeEditor<Microsoft.Windows.Controls.PrimitiveTypeCollectionEditor>
+  public class PrimitiveTypeCollectionEditor : TypeEditor<Microsoft.Windows.Controls.PrimitiveTypeCollectionEditor>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+      Editor.Content = "(Collection)";
+    }
+
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = Microsoft.Windows.Controls.PrimitiveTypeCollectionEditor.ItemsSourceProperty;
+    }
+
+    protected override void ResolveValueBinding( PropertyItem propertyItem )
     {
-        protected override void SetControlProperties()
-        {
-            Editor.BorderThickness = new System.Windows.Thickness(0);
-            Editor.Content = "(Collection)";
-        }
-
-        protected override void SetValueDependencyProperty()
-        {
-            ValueProperty = Microsoft.Windows.Controls.PrimitiveTypeCollectionEditor.ItemsSourceProperty;
-        }
-
-        protected override void ResolveValueBinding(PropertyItem propertyItem)
-        {
-            Editor.ItemsSourceType = propertyItem.PropertyType;
-            Editor.ItemType = propertyItem.PropertyType.GetGenericArguments()[0];
-            base.ResolveValueBinding(propertyItem);
-        }
+      Editor.ItemsSourceType = propertyItem.PropertyType;
+      Editor.ItemType = propertyItem.PropertyType.GetGenericArguments()[ 0 ];
+      base.ResolveValueBinding( propertyItem );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
index 67505e9e..a3994024 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBlockEditor.cs
@@ -1,18 +1,35 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Controls;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public class TextBlockEditor : TypeEditor<TextBlock>
+  public class TextBlockEditor : TypeEditor<TextBlock>
+  {
+    protected override void SetValueDependencyProperty()
+    {
+      ValueProperty = TextBlock.TextProperty;
+    }
+
+    protected override void SetControlProperties()
     {
-        protected override void SetValueDependencyProperty()
-        {
-            ValueProperty = TextBlock.TextProperty;
-        }
-
-        protected override void SetControlProperties()
-        {
-            Editor.Margin = new System.Windows.Thickness(5, 0, 0, 0);
-        }
+      Editor.Margin = new System.Windows.Thickness( 5, 0, 0, 0 );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
index c6d24199..b6e09a8e 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TextBoxEditor.cs
@@ -1,18 +1,35 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Controls;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public class TextBoxEditor : TypeEditor<WatermarkTextBox>
+  public class TextBoxEditor : TypeEditor<WatermarkTextBox>
+  {
+    protected override void SetControlProperties()
+    {
+      Editor.BorderThickness = new System.Windows.Thickness( 0 );
+    }
+
+    protected override void SetValueDependencyProperty()
     {
-        protected override void SetControlProperties()
-        {
-            Editor.BorderThickness = new System.Windows.Thickness(0);
-        }
-
-        protected override void SetValueDependencyProperty()
-        {
-            ValueProperty = TextBox.TextProperty;
-        }
+      ValueProperty = TextBox.TextProperty;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs
index 6771461b..ec7f9c66 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TimeSpanEditor.cs
@@ -1,32 +1,50 @@
-using System;
-using System.Windows.Data;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Globalization;
+using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public class TimeSpanEditor : DateTimeUpDownEditor
+  public class TimeSpanEditor : DateTimeUpDownEditor
+  {
+    private sealed class TimeSpanConverter : IValueConverter
+    {
+      object IValueConverter.Convert( object value, Type targetType, object parameter, CultureInfo culture )
+      {
+        return DateTime.Today + ( TimeSpan )value;
+      }
+
+      object IValueConverter.ConvertBack( object value, Type targetType, object parameter, CultureInfo culture )
+      {
+        return ( ( DateTime )value ).TimeOfDay;
+      }
+    }
+
+    protected override void SetControlProperties()
+    {
+      Editor.Format = DateTimeFormat.LongTime;
+    }
+
+    protected override IValueConverter CreateValueConverter()
     {
-        private sealed class TimeSpanConverter : IValueConverter
-        {
-            object IValueConverter.Convert(object value, Type targetType, object parameter, CultureInfo culture)
-            {
-                return DateTime.Today + (TimeSpan)value;
-            }
-
-            object IValueConverter.ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-            {
-                return ((DateTime)value).TimeOfDay;
-            }
-        }
-
-        protected override void SetControlProperties()
-        {
-            Editor.Format = DateTimeFormat.LongTime;
-        }
-
-        protected override IValueConverter CreateValueConverter()
-        {
-            return new TimeSpanConverter();            
-        }
+      return new TimeSpanConverter();
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs
index 65dd9f1b..70cf33ec 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/Editors/TypeEditor.cs
@@ -1,57 +1,81 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls.PropertyGrid.Editors
 {
-    public abstract class TypeEditor<T> : ITypeEditor
-        where T : FrameworkElement, new()
-    {
-        #region Properties
+  public abstract class TypeEditor<T> : ITypeEditor where T : FrameworkElement, new()
+  {
+    #region Properties
 
-        protected T Editor { get; set; }
-        protected DependencyProperty ValueProperty { get; set; }
+    protected T Editor
+    {
+      get;
+      set;
+    }
+    protected DependencyProperty ValueProperty
+    {
+      get;
+      set;
+    }
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region ITypeEditor Members
+    #region ITypeEditor Members
 
-        public virtual FrameworkElement ResolveEditor(PropertyItem propertyItem)
-        {
-            Editor = new T();
-            SetValueDependencyProperty();
-            SetControlProperties();
-            ResolveValueBinding(propertyItem);
-            return Editor;
-        }
+    public virtual FrameworkElement ResolveEditor( PropertyItem propertyItem )
+    {
+      Editor = new T();
+      SetValueDependencyProperty();
+      SetControlProperties();
+      ResolveValueBinding( propertyItem );
+      return Editor;
+    }
 
-        #endregion //ITypeEditor Members
+    #endregion //ITypeEditor Members
 
-        #region Methods
+    #region Methods
 
-        protected virtual IValueConverter CreateValueConverter()
-        {
-            return null;
-        }
+    protected virtual IValueConverter CreateValueConverter()
+    {
+      return null;
+    }
 
-        protected virtual void ResolveValueBinding(PropertyItem propertyItem)
-        {
-            var _binding = new Binding("Value");
-            _binding.Source = propertyItem;
-            _binding.ValidatesOnExceptions = true;
-            _binding.ValidatesOnDataErrors = true;
-            _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
-            _binding.Converter = CreateValueConverter();
-            BindingOperations.SetBinding(Editor, ValueProperty, _binding);
-        }
+    protected virtual void ResolveValueBinding( PropertyItem propertyItem )
+    {
+      var _binding = new Binding( "Value" );
+      _binding.Source = propertyItem;
+      _binding.ValidatesOnExceptions = true;
+      _binding.ValidatesOnDataErrors = true;
+      _binding.Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay;
+      _binding.Converter = CreateValueConverter();
+      BindingOperations.SetBinding( Editor, ValueProperty, _binding );
+    }
 
-        protected virtual void SetControlProperties()
-        {
-            //TODO: implement in derived class
-        }
+    protected virtual void SetControlProperties()
+    {
+      //TODO: implement in derived class
+    }
 
-        protected abstract void SetValueDependencyProperty();
+    protected abstract void SetValueDependencyProperty();
 
-        #endregion //Methods
-    }
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs
index 2c66aac6..33b179e7 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinition.cs
@@ -1,9 +1,30 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls.PropertyGrid
 {
-    public class PropertyDefinition
+  public class PropertyDefinition
+  {
+    public string Name
     {
-        public string Name { get; set; }
+      get;
+      set;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs
index 0c8ca829..5774a922 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyDefinitionCollection.cs
@@ -1,21 +1,39 @@
-using System.Collections.ObjectModel;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Collections.ObjectModel;
 
 namespace Microsoft.Windows.Controls.PropertyGrid
 {
-    public class PropertyDefinitionCollection : ObservableCollection<PropertyDefinition>
+  public class PropertyDefinitionCollection : ObservableCollection<PropertyDefinition>
+  {
+    public PropertyDefinition this[ string propertyName ]
     {
-        public PropertyDefinition this[string propertyName]
+      get
+      {
+        foreach( var item in Items )
         {
-            get
-            {
-                foreach (var item in Items)
-                {
-                    if (item.Name == propertyName)
-                        return item;
-                }
-
-                return null;
-            }
+          if( item.Name == propertyName )
+            return item;
         }
+
+        return null;
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs
index 97148751..868f968f 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGrid.cs
@@ -1,4 +1,22 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -11,523 +29,651 @@ using Microsoft.Windows.Controls.PropertyGrid.Commands;
 
 namespace Microsoft.Windows.Controls.PropertyGrid
 {
-    public class PropertyGrid : Control
-    {
-        #region Members
+  public class PropertyGrid : Control
+  {
+    #region Members
 
-        private Thumb _dragThumb;
-        private List<PropertyItem> _propertyItemsCache;
+    private Thumb _dragThumb;
+    private List<PropertyItem> _propertyItemsCache;
 
-        #endregion //Members
+    #endregion //Members
 
-        #region Properties
+    #region Properties
 
-        #region AdvancedOptionsMenu
+    #region AdvancedOptionsMenu
 
-        public static readonly DependencyProperty AdvancedOptionsMenuProperty = DependencyProperty.Register("AdvancedOptionsMenu", typeof(ContextMenu), typeof(PropertyGrid), new UIPropertyMetadata(null));
-        public ContextMenu AdvancedOptionsMenu
-        {
-            get { return (ContextMenu)GetValue(AdvancedOptionsMenuProperty); }
-            set { SetValue(AdvancedOptionsMenuProperty, value); }
-        }
+    public static readonly DependencyProperty AdvancedOptionsMenuProperty = DependencyProperty.Register( "AdvancedOptionsMenu", typeof( ContextMenu ), typeof( PropertyGrid ), new UIPropertyMetadata( null ) );
+    public ContextMenu AdvancedOptionsMenu
+    {
+      get
+      {
+        return ( ContextMenu )GetValue( AdvancedOptionsMenuProperty );
+      }
+      set
+      {
+        SetValue( AdvancedOptionsMenuProperty, value );
+      }
+    }
 
-        #endregion //AdvancedOptionsMenu
+    #endregion //AdvancedOptionsMenu
 
-        #region AutoGenerateProperties
+    #region AutoGenerateProperties
 
-        public static readonly DependencyProperty AutoGeneratePropertiesProperty = DependencyProperty.Register("AutoGenerateProperties", typeof(bool), typeof(PropertyGrid), new UIPropertyMetadata(true));
-        public bool AutoGenerateProperties
-        {
-            get { return (bool)GetValue(AutoGeneratePropertiesProperty); }
-            set { SetValue(AutoGeneratePropertiesProperty, value); }
-        }
+    public static readonly DependencyProperty AutoGeneratePropertiesProperty = DependencyProperty.Register( "AutoGenerateProperties", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool AutoGenerateProperties
+    {
+      get
+      {
+        return ( bool )GetValue( AutoGeneratePropertiesProperty );
+      }
+      set
+      {
+        SetValue( AutoGeneratePropertiesProperty, value );
+      }
+    }
 
-        #endregion //AutoGenerateProperties
+    #endregion //AutoGenerateProperties
 
-        #region DisplaySummary
+    #region DisplaySummary
 
-        public static readonly DependencyProperty DisplaySummaryProperty = DependencyProperty.Register("DisplaySummary", typeof(bool), typeof(PropertyGrid), new UIPropertyMetadata(true));
-        public bool DisplaySummary
-        {
-            get { return (bool)GetValue(DisplaySummaryProperty); }
-            set { SetValue(DisplaySummaryProperty, value); }
-        }
+    public static readonly DependencyProperty DisplaySummaryProperty = DependencyProperty.Register( "DisplaySummary", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool DisplaySummary
+    {
+      get
+      {
+        return ( bool )GetValue( DisplaySummaryProperty );
+      }
+      set
+      {
+        SetValue( DisplaySummaryProperty, value );
+      }
+    }
 
-        #endregion //DisplaySummary
+    #endregion //DisplaySummary
 
-        #region EditorDefinitions
+    #region EditorDefinitions
 
-        public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register("EditorDefinitions", typeof(EditorDefinitionCollection), typeof(PropertyGrid), new UIPropertyMetadata(null));
-        public EditorDefinitionCollection EditorDefinitions
-        {
-            get { return (EditorDefinitionCollection)GetValue(EditorDefinitionsProperty); }
-            set { SetValue(EditorDefinitionsProperty, value); }
-        }
+    public static readonly DependencyProperty EditorDefinitionsProperty = DependencyProperty.Register( "EditorDefinitions", typeof( EditorDefinitionCollection ), typeof( PropertyGrid ), new UIPropertyMetadata( null ) );
+    public EditorDefinitionCollection EditorDefinitions
+    {
+      get
+      {
+        return ( EditorDefinitionCollection )GetValue( EditorDefinitionsProperty );
+      }
+      set
+      {
+        SetValue( EditorDefinitionsProperty, value );
+      }
+    }
 
-        #endregion //EditorDefinitions
+    #endregion //EditorDefinitions
 
-        #region Filter
+    #region Filter
 
-        public static readonly DependencyProperty FilterProperty = DependencyProperty.Register("Filter", typeof(string), typeof(PropertyGrid), new UIPropertyMetadata(null, OnFilterChanged));
-        public string Filter
-        {
-            get { return (string)GetValue(FilterProperty); }
-            set { SetValue(FilterProperty, value); }
-        }
+    public static readonly DependencyProperty FilterProperty = DependencyProperty.Register( "Filter", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnFilterChanged ) );
+    public string Filter
+    {
+      get
+      {
+        return ( string )GetValue( FilterProperty );
+      }
+      set
+      {
+        SetValue( FilterProperty, value );
+      }
+    }
 
-        private static void OnFilterChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PropertyGrid propertyGrid = o as PropertyGrid;
-            if (propertyGrid != null)
-                propertyGrid.OnFilterChanged((string)e.OldValue, (string)e.NewValue);
-        }
+    private static void OnFilterChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnFilterChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
 
-        protected virtual void OnFilterChanged(string oldValue, string newValue)
-        {
-            if (Properties != null)
-                Properties.Filter(newValue);
-        }
+    protected virtual void OnFilterChanged( string oldValue, string newValue )
+    {
+      if( Properties != null )
+        Properties.Filter( newValue );
+    }
 
-        #endregion //Filter
+    #endregion //Filter
 
-        #region FilterWatermark
+    #region FilterWatermark
 
-        public static readonly DependencyProperty FilterWatermarkProperty = DependencyProperty.Register("FilterWatermark", typeof(string), typeof(PropertyGrid), new UIPropertyMetadata("Search"));
-        public string FilterWatermark
-        {
-            get { return (string)GetValue(FilterWatermarkProperty); }
-            set { SetValue(FilterWatermarkProperty, value); }
-        }
+    public static readonly DependencyProperty FilterWatermarkProperty = DependencyProperty.Register( "FilterWatermark", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( "Search" ) );
+    public string FilterWatermark
+    {
+      get
+      {
+        return ( string )GetValue( FilterWatermarkProperty );
+      }
+      set
+      {
+        SetValue( FilterWatermarkProperty, value );
+      }
+    }
 
-        #endregion //FilterWatermark
+    #endregion //FilterWatermark
 
-        #region IsCategorized
+    #region IsCategorized
 
-        public static readonly DependencyProperty IsCategorizedProperty = DependencyProperty.Register("IsCategorized", typeof(bool), typeof(PropertyGrid), new UIPropertyMetadata(true, OnIsCategorizedChanged));
-        public bool IsCategorized
-        {
-            get { return (bool)GetValue(IsCategorizedProperty); }
-            set { SetValue(IsCategorizedProperty, value); }
-        }
+    public static readonly DependencyProperty IsCategorizedProperty = DependencyProperty.Register( "IsCategorized", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true, OnIsCategorizedChanged ) );
+    public bool IsCategorized
+    {
+      get
+      {
+        return ( bool )GetValue( IsCategorizedProperty );
+      }
+      set
+      {
+        SetValue( IsCategorizedProperty, value );
+      }
+    }
 
-        private static void OnIsCategorizedChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PropertyGrid propertyGrid = o as PropertyGrid;
-            if (propertyGrid != null)
-                propertyGrid.OnIsCategorizedChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
+    private static void OnIsCategorizedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnIsCategorizedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
 
-        protected virtual void OnIsCategorizedChanged(bool oldValue, bool newValue)
-        {
-            InitializePropertyGrid(newValue);
-        }
+    protected virtual void OnIsCategorizedChanged( bool oldValue, bool newValue )
+    {
+      InitializePropertyGrid( newValue );
+    }
 
-        #endregion //IsCategorized
+    #endregion //IsCategorized
 
-        #region NameColumnWidth
+    #region NameColumnWidth
 
-        public static readonly DependencyProperty NameColumnWidthProperty = DependencyProperty.Register("NameColumnWidth", typeof(double), typeof(PropertyGrid), new UIPropertyMetadata(150.0));
-        public double NameColumnWidth
-        {
-            get { return (double)GetValue(NameColumnWidthProperty); }
-            set { SetValue(NameColumnWidthProperty, value); }
-        }
+    public static readonly DependencyProperty NameColumnWidthProperty = DependencyProperty.Register( "NameColumnWidth", typeof( double ), typeof( PropertyGrid ), new UIPropertyMetadata( 150.0 ) );
+    public double NameColumnWidth
+    {
+      get
+      {
+        return ( double )GetValue( NameColumnWidthProperty );
+      }
+      set
+      {
+        SetValue( NameColumnWidthProperty, value );
+      }
+    }
 
-        #endregion //NameColumnWidth
+    #endregion //NameColumnWidth
 
-        #region Properties
+    #region Properties
 
-        public static readonly DependencyProperty PropertiesProperty = DependencyProperty.Register("Properties", typeof(PropertyItemCollection), typeof(PropertyGrid), new UIPropertyMetadata(null));
-        public PropertyItemCollection Properties
-        {
-            get { return (PropertyItemCollection)GetValue(PropertiesProperty); }
-            private set { SetValue(PropertiesProperty, value); }
-        }
+    public static readonly DependencyProperty PropertiesProperty = DependencyProperty.Register( "Properties", typeof( PropertyItemCollection ), typeof( PropertyGrid ), new UIPropertyMetadata( null ) );
+    public PropertyItemCollection Properties
+    {
+      get
+      {
+        return ( PropertyItemCollection )GetValue( PropertiesProperty );
+      }
+      private set
+      {
+        SetValue( PropertiesProperty, value );
+      }
+    }
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region PropertyDefinitions
+    #region PropertyDefinitions
 
-        public static readonly DependencyProperty PropertyDefinitionsProperty = DependencyProperty.Register("PropertyDefinitions", typeof(PropertyDefinitionCollection), typeof(PropertyGrid), new UIPropertyMetadata(null));
-        public PropertyDefinitionCollection PropertyDefinitions
-        {
-            get { return (PropertyDefinitionCollection)GetValue(PropertyDefinitionsProperty); }
-            set { SetValue(PropertyDefinitionsProperty, value); }
-        }
+    public static readonly DependencyProperty PropertyDefinitionsProperty = DependencyProperty.Register( "PropertyDefinitions", typeof( PropertyDefinitionCollection ), typeof( PropertyGrid ), new UIPropertyMetadata( null ) );
+    public PropertyDefinitionCollection PropertyDefinitions
+    {
+      get
+      {
+        return ( PropertyDefinitionCollection )GetValue( PropertyDefinitionsProperty );
+      }
+      set
+      {
+        SetValue( PropertyDefinitionsProperty, value );
+      }
+    }
 
-        #endregion //PropertyDefinitions
+    #endregion //PropertyDefinitions
 
-        #region SelectedObject
+    #region SelectedObject
 
-        public static readonly DependencyProperty SelectedObjectProperty = DependencyProperty.Register("SelectedObject", typeof(object), typeof(PropertyGrid), new UIPropertyMetadata(null, OnSelectedObjectChanged));
-        public object SelectedObject
-        {
-            get { return (object)GetValue(SelectedObjectProperty); }
-            set { SetValue(SelectedObjectProperty, value); }
-        }
+    public static readonly DependencyProperty SelectedObjectProperty = DependencyProperty.Register( "SelectedObject", typeof( object ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedObjectChanged ) );
+    public object SelectedObject
+    {
+      get
+      {
+        return ( object )GetValue( SelectedObjectProperty );
+      }
+      set
+      {
+        SetValue( SelectedObjectProperty, value );
+      }
+    }
 
-        private static void OnSelectedObjectChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PropertyGrid propertyInspector = o as PropertyGrid;
-            if (propertyInspector != null)
-                propertyInspector.OnSelectedObjectChanged((object)e.OldValue, (object)e.NewValue);
-        }
+    private static void OnSelectedObjectChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyInspector = o as PropertyGrid;
+      if( propertyInspector != null )
+        propertyInspector.OnSelectedObjectChanged( ( object )e.OldValue, ( object )e.NewValue );
+    }
 
-        protected virtual void OnSelectedObjectChanged(object oldValue, object newValue)
-        {
-            if (newValue == null)
-                ResetPropertyGrid();
-            else
-            {
-                SetSelectedObjectNameBinding(newValue);
-                SelectedObjectType = newValue.GetType();
-                _propertyItemsCache = GetObjectProperties(newValue);
-                InitializePropertyGrid(IsCategorized);
-            }
-        }
+    protected virtual void OnSelectedObjectChanged( object oldValue, object newValue )
+    {
+      if( newValue == null )
+        ResetPropertyGrid();
+      else
+      {
+        SetSelectedObjectNameBinding( newValue );
+        SelectedObjectType = newValue.GetType();
+        _propertyItemsCache = GetObjectProperties( newValue );
+        InitializePropertyGrid( IsCategorized );
+      }
+    }
 
-        #endregion //SelectedObject
+    #endregion //SelectedObject
 
-        #region SelectedObjectType
+    #region SelectedObjectType
 
-        public static readonly DependencyProperty SelectedObjectTypeProperty = DependencyProperty.Register("SelectedObjectType", typeof(Type), typeof(PropertyGrid), new UIPropertyMetadata(null, OnSelectedObjectTypeChanged));
-        public Type SelectedObjectType
-        {
-            get { return (Type)GetValue(SelectedObjectTypeProperty); }
-            private set { SetValue(SelectedObjectTypeProperty, value); }
-        }
+    public static readonly DependencyProperty SelectedObjectTypeProperty = DependencyProperty.Register( "SelectedObjectType", typeof( Type ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedObjectTypeChanged ) );
+    public Type SelectedObjectType
+    {
+      get
+      {
+        return ( Type )GetValue( SelectedObjectTypeProperty );
+      }
+      private set
+      {
+        SetValue( SelectedObjectTypeProperty, value );
+      }
+    }
 
-        private static void OnSelectedObjectTypeChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PropertyGrid propertyGrid = o as PropertyGrid;
-            if (propertyGrid != null)
-                propertyGrid.OnSelectedObjectTypeChanged((Type)e.OldValue, (Type)e.NewValue);
-        }
+    private static void OnSelectedObjectTypeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnSelectedObjectTypeChanged( ( Type )e.OldValue, ( Type )e.NewValue );
+    }
 
-        protected virtual void OnSelectedObjectTypeChanged(Type oldValue, Type newValue)
-        {
-            if (newValue == null)
-                SelectedObjectTypeName = string.Empty;
-            else
-            {
-                DisplayNameAttribute displayNameAttribute = newValue.GetCustomAttributes(false).OfType<DisplayNameAttribute>().FirstOrDefault();
-                SelectedObjectTypeName = displayNameAttribute == null ? newValue.Name : displayNameAttribute.DisplayName;
-            }
-        }
+    protected virtual void OnSelectedObjectTypeChanged( Type oldValue, Type newValue )
+    {
+      if( newValue == null )
+        SelectedObjectTypeName = string.Empty;
+      else
+      {
+        DisplayNameAttribute displayNameAttribute = newValue.GetCustomAttributes( false ).OfType<DisplayNameAttribute>().FirstOrDefault();
+        SelectedObjectTypeName = displayNameAttribute == null ? newValue.Name : displayNameAttribute.DisplayName;
+      }
+    }
 
-        #endregion //SelectedObjectType
+    #endregion //SelectedObjectType
 
-        #region SelectedObjectTypeName
+    #region SelectedObjectTypeName
 
-        public static readonly DependencyProperty SelectedObjectTypeNameProperty = DependencyProperty.Register("SelectedObjectTypeName", typeof(string), typeof(PropertyGrid), new UIPropertyMetadata(string.Empty));
-        public string SelectedObjectTypeName
-        {
-            get { return (string)GetValue(SelectedObjectTypeNameProperty); }
-            private set { SetValue(SelectedObjectTypeNameProperty, value); }
-        }
+    public static readonly DependencyProperty SelectedObjectTypeNameProperty = DependencyProperty.Register( "SelectedObjectTypeName", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( string.Empty ) );
+    public string SelectedObjectTypeName
+    {
+      get
+      {
+        return ( string )GetValue( SelectedObjectTypeNameProperty );
+      }
+      private set
+      {
+        SetValue( SelectedObjectTypeNameProperty, value );
+      }
+    }
 
-        #endregion //SelectedObjectTypeName
+    #endregion //SelectedObjectTypeName
 
-        #region SelectedObjectName
+    #region SelectedObjectName
 
-        public static readonly DependencyProperty SelectedObjectNameProperty = DependencyProperty.Register("SelectedObjectName", typeof(string), typeof(PropertyGrid), new UIPropertyMetadata(string.Empty, OnSelectedObjectNameChanged, OnCoerceSelectedObjectName));
-        public string SelectedObjectName
-        {
-            get { return (string)GetValue(SelectedObjectNameProperty); }
-            private set { SetValue(SelectedObjectNameProperty, value); }
-        }
+    public static readonly DependencyProperty SelectedObjectNameProperty = DependencyProperty.Register( "SelectedObjectName", typeof( string ), typeof( PropertyGrid ), new UIPropertyMetadata( string.Empty, OnSelectedObjectNameChanged, OnCoerceSelectedObjectName ) );
+    public string SelectedObjectName
+    {
+      get
+      {
+        return ( string )GetValue( SelectedObjectNameProperty );
+      }
+      private set
+      {
+        SetValue( SelectedObjectNameProperty, value );
+      }
+    }
 
-        private static object OnCoerceSelectedObjectName(DependencyObject o, object baseValue)
-        {
-            if (String.IsNullOrEmpty((String)baseValue))
-                return "<no name>";
+    private static object OnCoerceSelectedObjectName( DependencyObject o, object baseValue )
+    {
+      if( String.IsNullOrEmpty( ( String )baseValue ) )
+        return "<no name>";
 
-            return baseValue;
-        }
+      return baseValue;
+    }
 
-        private static void OnSelectedObjectNameChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PropertyGrid propertyGrid = o as PropertyGrid;
-            if (propertyGrid != null)
-                propertyGrid.SelectedObjectNameChanged((string)e.OldValue, (string)e.NewValue);
-        }
+    private static void OnSelectedObjectNameChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.SelectedObjectNameChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
 
-        protected virtual void SelectedObjectNameChanged(string oldValue, string newValue)
-        {
+    protected virtual void SelectedObjectNameChanged( string oldValue, string newValue )
+    {
 
-        }
+    }
 
-        #endregion //SelectedObjectName
+    #endregion //SelectedObjectName
 
-        #region SelectedProperty
+    #region SelectedProperty
 
-        public static readonly DependencyProperty SelectedPropertyProperty = DependencyProperty.Register("SelectedProperty", typeof(PropertyItem), typeof(PropertyGrid), new UIPropertyMetadata(null, OnSelectedPropertyChanged));
-        public PropertyItem SelectedProperty
-        {
-            get { return (PropertyItem)GetValue(SelectedPropertyProperty); }
-            internal set { SetValue(SelectedPropertyProperty, value); }
-        }
+    public static readonly DependencyProperty SelectedPropertyProperty = DependencyProperty.Register( "SelectedProperty", typeof( PropertyItem ), typeof( PropertyGrid ), new UIPropertyMetadata( null, OnSelectedPropertyChanged ) );
+    public PropertyItem SelectedProperty
+    {
+      get
+      {
+        return ( PropertyItem )GetValue( SelectedPropertyProperty );
+      }
+      internal set
+      {
+        SetValue( SelectedPropertyProperty, value );
+      }
+    }
 
-        private static void OnSelectedPropertyChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PropertyGrid propertyGrid = o as PropertyGrid;
-            if (propertyGrid != null)
-                propertyGrid.OnSelectedPropertyChanged((PropertyItem)e.OldValue, (PropertyItem)e.NewValue);
-        }
+    private static void OnSelectedPropertyChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyGrid propertyGrid = o as PropertyGrid;
+      if( propertyGrid != null )
+        propertyGrid.OnSelectedPropertyChanged( ( PropertyItem )e.OldValue, ( PropertyItem )e.NewValue );
+    }
 
-        protected virtual void OnSelectedPropertyChanged(PropertyItem oldValue, PropertyItem newValue)
-        {
-            if (oldValue != null)
-                oldValue.IsSelected = false;
+    protected virtual void OnSelectedPropertyChanged( PropertyItem oldValue, PropertyItem newValue )
+    {
+      if( oldValue != null )
+        oldValue.IsSelected = false;
 
-            //if (newValue != null)
-            //    newValue.IsSelected = true;
+      //if (newValue != null)
+      //    newValue.IsSelected = true;
 
-            RaiseEvent(new RoutedEventArgs(PropertyGrid.SelectedPropertyItemChangedEvent, newValue));
-        }
+      RaiseEvent( new RoutedEventArgs( PropertyGrid.SelectedPropertyItemChangedEvent, newValue ) );
+    }
 
-        #endregion //SelectedProperty
+    #endregion //SelectedProperty
 
-        #region ShowAdvancedOptions
+    #region ShowAdvancedOptions
 
-        public static readonly DependencyProperty ShowAdvancedOptionsProperty = DependencyProperty.Register("ShowAdvancedOptions", typeof(bool), typeof(PropertyGrid), new UIPropertyMetadata(false));
-        public bool ShowAdvancedOptions
-        {
-            get { return (bool)GetValue(ShowAdvancedOptionsProperty); }
-            set { SetValue(ShowAdvancedOptionsProperty, value); }
-        }
+    public static readonly DependencyProperty ShowAdvancedOptionsProperty = DependencyProperty.Register( "ShowAdvancedOptions", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( false ) );
+    public bool ShowAdvancedOptions
+    {
+      get
+      {
+        return ( bool )GetValue( ShowAdvancedOptionsProperty );
+      }
+      set
+      {
+        SetValue( ShowAdvancedOptionsProperty, value );
+      }
+    }
 
-        #endregion //ShowAdvancedOptions
+    #endregion //ShowAdvancedOptions
 
-        #region ShowSearchBox
+    #region ShowSearchBox
 
-        public static readonly DependencyProperty ShowSearchBoxProperty = DependencyProperty.Register("ShowSearchBox", typeof(bool), typeof(PropertyGrid), new UIPropertyMetadata(true));
-        public bool ShowSearchBox
-        {
-            get { return (bool)GetValue(ShowSearchBoxProperty); }
-            set { SetValue(ShowSearchBoxProperty, value); }
-        }
+    public static readonly DependencyProperty ShowSearchBoxProperty = DependencyProperty.Register( "ShowSearchBox", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool ShowSearchBox
+    {
+      get
+      {
+        return ( bool )GetValue( ShowSearchBoxProperty );
+      }
+      set
+      {
+        SetValue( ShowSearchBoxProperty, value );
+      }
+    }
 
-        #endregion //ShowSearchBox
+    #endregion //ShowSearchBox
 
-        #region ShowSortOptions
+    #region ShowSortOptions
 
-        public static readonly DependencyProperty ShowSortOptionsProperty = DependencyProperty.Register("ShowSortOptions", typeof(bool), typeof(PropertyGrid), new UIPropertyMetadata(true));
-        public bool ShowSortOptions
-        {
-            get { return (bool)GetValue(ShowSortOptionsProperty); }
-            set { SetValue(ShowSortOptionsProperty, value); }
-        }
+    public static readonly DependencyProperty ShowSortOptionsProperty = DependencyProperty.Register( "ShowSortOptions", typeof( bool ), typeof( PropertyGrid ), new UIPropertyMetadata( true ) );
+    public bool ShowSortOptions
+    {
+      get
+      {
+        return ( bool )GetValue( ShowSortOptionsProperty );
+      }
+      set
+      {
+        SetValue( ShowSortOptionsProperty, value );
+      }
+    }
 
-        #endregion //ShowSortOptions
+    #endregion //ShowSortOptions
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region Constructors
+    #region Constructors
 
-        static PropertyGrid()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(PropertyGrid), new FrameworkPropertyMetadata(typeof(PropertyGrid)));
-        }
+    static PropertyGrid()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyGrid ), new FrameworkPropertyMetadata( typeof( PropertyGrid ) ) );
+    }
 
-        public PropertyGrid()
-        {
-            EditorDefinitions = new EditorDefinitionCollection();
-            PropertyDefinitions = new PropertyDefinitionCollection();
-            CommandBindings.Add(new CommandBinding(PropertyGridCommands.ClearFilter, ClearFilter, CanClearFilter));
-        }
+    public PropertyGrid()
+    {
+      EditorDefinitions = new EditorDefinitionCollection();
+      PropertyDefinitions = new PropertyDefinitionCollection();
+      CommandBindings.Add( new CommandBinding( PropertyGridCommands.ClearFilter, ClearFilter, CanClearFilter ) );
+    }
 
-        #endregion //Constructors
+    #endregion //Constructors
 
-        #region Base Class Overrides
+    #region Base Class Overrides
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-            if (_dragThumb != null)
-                _dragThumb.DragDelta -= DragThumb_DragDelta;
-            _dragThumb = GetTemplateChild("PART_DragThumb") as Thumb;
-            if (_dragThumb != null)
-                _dragThumb.DragDelta += DragThumb_DragDelta;
-        }
+      if( _dragThumb != null )
+        _dragThumb.DragDelta -= DragThumb_DragDelta;
+      _dragThumb = GetTemplateChild( "PART_DragThumb" ) as Thumb;
+      if( _dragThumb != null )
+        _dragThumb.DragDelta += DragThumb_DragDelta;
+    }
 
-        protected override void OnPreviewKeyDown(KeyEventArgs e)
+    protected override void OnPreviewKeyDown( KeyEventArgs e )
+    {
+      //hitting enter on textbox will update value of underlying source
+      if( this.SelectedProperty != null && e.Key == Key.Enter && e.OriginalSource is TextBox )
+      {
+        if( !( e.OriginalSource as TextBox ).AcceptsReturn )
         {
-            //hitting enter on textbox will update value of underlying source
-            if (this.SelectedProperty != null && e.Key == Key.Enter && e.OriginalSource is TextBox)
-            {
-                if (!(e.OriginalSource as TextBox).AcceptsReturn)
-                {
-                    BindingExpression be = ((TextBox)e.OriginalSource).GetBindingExpression(TextBox.TextProperty);
-                    be.UpdateSource();
-                }
-            }
+          BindingExpression be = ( ( TextBox )e.OriginalSource ).GetBindingExpression( TextBox.TextProperty );
+          be.UpdateSource();
         }
+      }
+    }
 
-        #endregion //Base Class Overrides
+    #endregion //Base Class Overrides
 
-        #region Event Handlers
+    #region Event Handlers
 
-        void DragThumb_DragDelta(object sender, DragDeltaEventArgs e)
-        {
-            NameColumnWidth = Math.Max(0, NameColumnWidth + e.HorizontalChange);
-        }
+    void DragThumb_DragDelta( object sender, DragDeltaEventArgs e )
+    {
+      NameColumnWidth = Math.Max( 0, NameColumnWidth + e.HorizontalChange );
+    }
 
-        #endregion //Event Handlers
+    #endregion //Event Handlers
 
-        #region Commands
+    #region Commands
 
-        private void ClearFilter(object sender, ExecutedRoutedEventArgs e)
-        {
-            Filter = String.Empty;
-        }
+    private void ClearFilter( object sender, ExecutedRoutedEventArgs e )
+    {
+      Filter = String.Empty;
+    }
 
-        private void CanClearFilter(object sender, CanExecuteRoutedEventArgs e)
-        {
-            e.CanExecute = !String.IsNullOrEmpty(Filter);
-        }
+    private void CanClearFilter( object sender, CanExecuteRoutedEventArgs e )
+    {
+      e.CanExecute = !String.IsNullOrEmpty( Filter );
+    }
 
-        #endregion //Commands
+    #endregion //Commands
 
-        #region Methods
+    #region Methods
 
-        private void InitializePropertyGrid(bool isCategorized)
-        {
-            LoadProperties(isCategorized);
-            SetDragThumbMargin(isCategorized);
-        }
+    private void InitializePropertyGrid( bool isCategorized )
+    {
+      LoadProperties( isCategorized );
+      SetDragThumbMargin( isCategorized );
+    }
 
-        private void LoadProperties(bool isCategorized)
-        {
-            if (_propertyItemsCache == null)
-                return;
+    private void LoadProperties( bool isCategorized )
+    {
+      if( _propertyItemsCache == null )
+        return;
 
-            //clear any filters first
-            Filter = String.Empty;
+      //clear any filters first
+      Filter = String.Empty;
 
-            if (isCategorized)
-                Properties = PropertyGridUtilities.GetCategorizedProperties(_propertyItemsCache);
-            else
-                Properties = PropertyGridUtilities.GetAlphabetizedProperties(_propertyItemsCache);
-        }
+      if( isCategorized )
+        Properties = PropertyGridUtilities.GetCategorizedProperties( _propertyItemsCache );
+      else
+        Properties = PropertyGridUtilities.GetAlphabetizedProperties( _propertyItemsCache );
+    }
 
-        private List<PropertyItem> GetObjectProperties(object instance)
-        {
-            var propertyItems = new List<PropertyItem>();
-            if (instance == null)
-                return propertyItems;
+    private List<PropertyItem> GetObjectProperties( object instance )
+    {
+      var propertyItems = new List<PropertyItem>();
+      if( instance == null )
+        return propertyItems;
 
-            try
-            {
-                PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors(instance);
-
-                if (!AutoGenerateProperties)
-                {
-                    List<PropertyDescriptor> specificProperties = new List<PropertyDescriptor>();
-                    foreach (PropertyDefinition pd in PropertyDefinitions)
-                    {
-                        foreach (PropertyDescriptor descriptor in descriptors)
-                        {
-                            if (descriptor.Name == pd.Name)
-                            {
-                                specificProperties.Add(descriptor);
-                                break;
-                            }
-                        }
-                    }
-
-                    descriptors = new PropertyDescriptorCollection(specificProperties.ToArray());
-                }
-
-                foreach (PropertyDescriptor descriptor in descriptors)
-                {
-                    if (descriptor.IsBrowsable)
-                        propertyItems.Add(PropertyGridUtilities.CreatePropertyItem(descriptor, instance, this, descriptor.Name));
-                }
-            }
-            catch (Exception)
+      try
+      {
+        PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors( instance );
+
+        if( !AutoGenerateProperties )
+        {
+          List<PropertyDescriptor> specificProperties = new List<PropertyDescriptor>();
+          foreach( PropertyDefinition pd in PropertyDefinitions )
+          {
+            foreach( PropertyDescriptor descriptor in descriptors )
             {
-                //TODO: handle this some how
+              if( descriptor.Name == pd.Name )
+              {
+                specificProperties.Add( descriptor );
+                break;
+              }
             }
+          }
 
-            return propertyItems;
+          descriptors = new PropertyDescriptorCollection( specificProperties.ToArray() );
         }
 
-        private void SetSelectedObjectNameBinding(object selectedObject)
+        foreach( PropertyDescriptor descriptor in descriptors )
         {
-            if (selectedObject is FrameworkElement)
-            {
-                var binding = new Binding("Name");
-                binding.Source = selectedObject;
-                binding.Mode = BindingMode.OneWay;
-                BindingOperations.SetBinding(this, PropertyGrid.SelectedObjectNameProperty, binding);
-            }
+          if( descriptor.IsBrowsable )
+            propertyItems.Add( PropertyGridUtilities.CreatePropertyItem( descriptor, instance, this, descriptor.Name ) );
         }
+      }
+      catch( Exception )
+      {
+        //TODO: handle this some how
+      }
 
-        private void SetDragThumbMargin(bool isCategorized)
-        {
-            if (_dragThumb == null)
-                return;
+      return propertyItems;
+    }
 
-            if (isCategorized)
-                _dragThumb.Margin = new Thickness(6, 0, 0, 0);
-            else
-                _dragThumb.Margin = new Thickness(-1, 0, 0, 0);
-        }
+    private void SetSelectedObjectNameBinding( object selectedObject )
+    {
+      if( selectedObject is FrameworkElement )
+      {
+        var binding = new Binding( "Name" );
+        binding.Source = selectedObject;
+        binding.Mode = BindingMode.OneWay;
+        BindingOperations.SetBinding( this, PropertyGrid.SelectedObjectNameProperty, binding );
+      }
+    }
 
-        private void ResetPropertyGrid()
-        {
-            SelectedObjectName = String.Empty;
-            SelectedObjectType = null;
-            _propertyItemsCache = null;
-            SelectedProperty = null;
-            Properties = null;
-        }
+    private void SetDragThumbMargin( bool isCategorized )
+    {
+      if( _dragThumb == null )
+        return;
 
-        /// <summary>
-        /// Updates all property values in the PropertyGrid with the data from the SelectedObject
-        /// </summary>
-        public void Update()
-        {
-            foreach (var item in Properties)
-            {
-                BindingOperations.GetBindingExpressionBase(item, PropertyItem.ValueProperty).UpdateTarget();
-            }
-        }
+      if( isCategorized )
+        _dragThumb.Margin = new Thickness( 6, 0, 0, 0 );
+      else
+        _dragThumb.Margin = new Thickness( -1, 0, 0, 0 );
+    }
 
-        #endregion //Methods
+    private void ResetPropertyGrid()
+    {
+      SelectedObjectName = String.Empty;
+      SelectedObjectType = null;
+      _propertyItemsCache = null;
+      SelectedProperty = null;
+      Properties = null;
+    }
 
-        #region Events
+    /// <summary>
+    /// Updates all property values in the PropertyGrid with the data from the SelectedObject
+    /// </summary>
+    public void Update()
+    {
+      foreach( var item in Properties )
+      {
+        BindingOperations.GetBindingExpressionBase( item, PropertyItem.ValueProperty ).UpdateTarget();
+      }
+    }
 
-        public static readonly RoutedEvent PropertyValueChangedEvent = EventManager.RegisterRoutedEvent("PropertyValueChanged", RoutingStrategy.Bubble, typeof(PropertyValueChangedEventHandler), typeof(PropertyGrid));
-        public event PropertyValueChangedEventHandler PropertyValueChanged
-        {
-            add { AddHandler(PropertyValueChangedEvent, value); }
-            remove { RemoveHandler(PropertyValueChangedEvent, value); }
-        }
-        
-        public static readonly RoutedEvent SelectedPropertyItemChangedEvent = EventManager.RegisterRoutedEvent("SelectedPropertyItemChanged", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(PropertyGrid));
-        public event RoutedEventHandler SelectedPropertyItemChanged
-        {
-            add { AddHandler(SelectedPropertyItemChangedEvent, value); }
-            remove { RemoveHandler(SelectedPropertyItemChangedEvent, value); }
-        }
+    #endregion //Methods
+
+    #region Events
 
-        #endregion //Events
+    public static readonly RoutedEvent PropertyValueChangedEvent = EventManager.RegisterRoutedEvent( "PropertyValueChanged", RoutingStrategy.Bubble, typeof( PropertyValueChangedEventHandler ), typeof( PropertyGrid ) );
+    public event PropertyValueChangedEventHandler PropertyValueChanged
+    {
+      add
+      {
+        AddHandler( PropertyValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PropertyValueChangedEvent, value );
+      }
     }
 
-    public delegate void PropertyValueChangedEventHandler(object sender, PropertyValueChangedEventArgs e);
-    public class PropertyValueChangedEventArgs : RoutedEventArgs
+    public static readonly RoutedEvent SelectedPropertyItemChangedEvent = EventManager.RegisterRoutedEvent( "SelectedPropertyItemChanged", RoutingStrategy.Bubble, typeof( RoutedEventHandler ), typeof( PropertyGrid ) );
+    public event RoutedEventHandler SelectedPropertyItemChanged
     {
-        public object NewValue { get; set; }
-        public object OldValue { get; set; }
+      add
+      {
+        AddHandler( SelectedPropertyItemChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( SelectedPropertyItemChangedEvent, value );
+      }
+    }
 
-        public PropertyValueChangedEventArgs(RoutedEvent routedEvent, object source, object oldValue, object newValue)
-            : base(routedEvent, source)
-        {
-            NewValue = newValue;
-            OldValue = oldValue;
-        }
+    #endregion //Events
+  }
+
+  public delegate void PropertyValueChangedEventHandler( object sender, PropertyValueChangedEventArgs e );
+  public class PropertyValueChangedEventArgs : RoutedEventArgs
+  {
+    public object NewValue
+    {
+      get;
+      set;
+    }
+    public object OldValue
+    {
+      get;
+      set;
+    }
+
+    public PropertyValueChangedEventArgs( RoutedEvent routedEvent, object source, object oldValue, object newValue )
+      : base( routedEvent, source )
+    {
+      NewValue = newValue;
+      OldValue = oldValue;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
index c20502d4..979b0b5c 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyGridUtilities.cs
@@ -1,4 +1,22 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Windows;
@@ -9,184 +27,185 @@ using Microsoft.Windows.Controls.PropertyGrid.Editors;
 
 namespace Microsoft.Windows.Controls.PropertyGrid
 {
-    internal class PropertyGridUtilities
+  internal class PropertyGridUtilities
+  {
+    internal static T GetAttribute<T>( PropertyDescriptor property ) where T : Attribute
     {
-        internal static T GetAttribute<T>(PropertyDescriptor property) where T : Attribute
-        {
-            foreach (Attribute att in property.Attributes)
-            {
-                var tAtt = att as T;
-                if (tAtt != null) return tAtt;
-            }
-            return null;
-        }
+      foreach( Attribute att in property.Attributes )
+      {
+        var tAtt = att as T;
+        if( tAtt != null )
+          return tAtt;
+      }
+      return null;
+    }
 
-        internal static PropertyItemCollection GetAlphabetizedProperties(List<PropertyItem> propertyItems)
-        {
-            PropertyItemCollection propertyCollection = new PropertyItemCollection(propertyItems);
-            propertyCollection.SortBy("DisplayName", ListSortDirection.Ascending);
-            return propertyCollection;
-        }
+    internal static PropertyItemCollection GetAlphabetizedProperties( List<PropertyItem> propertyItems )
+    {
+      PropertyItemCollection propertyCollection = new PropertyItemCollection( propertyItems );
+      propertyCollection.SortBy( "DisplayName", ListSortDirection.Ascending );
+      return propertyCollection;
+    }
 
-        internal static PropertyItemCollection GetCategorizedProperties(List<PropertyItem> propertyItems)
-        {
-            PropertyItemCollection propertyCollection = new PropertyItemCollection(propertyItems);
-            propertyCollection.GroupBy("Category");
-            propertyCollection.SortBy("Category", ListSortDirection.Ascending);
-            propertyCollection.SortBy("PropertyOrder", ListSortDirection.Ascending);
-            propertyCollection.SortBy("DisplayName", ListSortDirection.Ascending);
-            return propertyCollection;
-        }
+    internal static PropertyItemCollection GetCategorizedProperties( List<PropertyItem> propertyItems )
+    {
+      PropertyItemCollection propertyCollection = new PropertyItemCollection( propertyItems );
+      propertyCollection.GroupBy( "Category" );
+      propertyCollection.SortBy( "Category", ListSortDirection.Ascending );
+      propertyCollection.SortBy( "PropertyOrder", ListSortDirection.Ascending );
+      propertyCollection.SortBy( "DisplayName", ListSortDirection.Ascending );
+      return propertyCollection;
+    }
 
 
-        internal static PropertyDescriptorCollection GetPropertyDescriptors(object instance)
-        {
-            PropertyDescriptorCollection descriptors;
-
-            TypeConverter tc = TypeDescriptor.GetConverter(instance);
-            if (tc == null || !tc.GetPropertiesSupported())
-            {
-
-                if (instance is ICustomTypeDescriptor)
-                    descriptors = ((ICustomTypeDescriptor)instance).GetProperties();
-                else
-                    descriptors = TypeDescriptor.GetProperties(instance.GetType());
-            }
-            else
-            {
-                descriptors = tc.GetProperties(instance);
-            }
-
-            return descriptors;
-        }
+    internal static PropertyDescriptorCollection GetPropertyDescriptors( object instance )
+    {
+      PropertyDescriptorCollection descriptors;
+
+      TypeConverter tc = TypeDescriptor.GetConverter( instance );
+      if( tc == null || !tc.GetPropertiesSupported() )
+      {
+
+        if( instance is ICustomTypeDescriptor )
+          descriptors = ( ( ICustomTypeDescriptor )instance ).GetProperties();
+        else
+          descriptors = TypeDescriptor.GetProperties( instance.GetType() );
+      }
+      else
+      {
+        descriptors = tc.GetProperties( instance );
+      }
+
+      return descriptors;
+    }
 
-        internal static PropertyItem CreatePropertyItem(PropertyDescriptor property, object instance, PropertyGrid grid, string bindingPath, int level)
-        {
-            PropertyItem item = CreatePropertyItem(property, instance, grid, bindingPath);
-            item.Level = level;
-            return item;
-        }
+    internal static PropertyItem CreatePropertyItem( PropertyDescriptor property, object instance, PropertyGrid grid, string bindingPath, int level )
+    {
+      PropertyItem item = CreatePropertyItem( property, instance, grid, bindingPath );
+      item.Level = level;
+      return item;
+    }
 
-        internal static PropertyItem CreatePropertyItem(PropertyDescriptor property, object instance, PropertyGrid grid, string bindingPath)
-        {
-            PropertyItem propertyItem = new PropertyItem(instance, property, grid, bindingPath);
+    internal static PropertyItem CreatePropertyItem( PropertyDescriptor property, object instance, PropertyGrid grid, string bindingPath )
+    {
+      PropertyItem propertyItem = new PropertyItem( instance, property, grid, bindingPath );
 
-            var binding = new Binding(bindingPath)
-            {
-                Source = instance,
-                ValidatesOnExceptions = true,
-                ValidatesOnDataErrors = true,
-                Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay
-            };
-            propertyItem.SetBinding(PropertyItem.ValueProperty, binding);
+      var binding = new Binding( bindingPath )
+      {
+        Source = instance,
+        ValidatesOnExceptions = true,
+        ValidatesOnDataErrors = true,
+        Mode = propertyItem.IsReadOnly ? BindingMode.OneWay : BindingMode.TwoWay
+      };
+      propertyItem.SetBinding( PropertyItem.ValueProperty, binding );
 
-            propertyItem.Editor = PropertyGridUtilities.GetTypeEditor(propertyItem, grid.EditorDefinitions);
+      propertyItem.Editor = PropertyGridUtilities.GetTypeEditor( propertyItem, grid.EditorDefinitions );
 
-            return propertyItem;
-        }
+      return propertyItem;
+    }
 
-        internal static FrameworkElement GetTypeEditor(PropertyItem propertyItem, EditorDefinitionCollection editorDefinitions)
-        {
-            //first check for an attribute editor
-            FrameworkElement editor = PropertyGridUtilities.GetAttibuteEditor(propertyItem);
+    internal static FrameworkElement GetTypeEditor( PropertyItem propertyItem, EditorDefinitionCollection editorDefinitions )
+    {
+      //first check for an attribute editor
+      FrameworkElement editor = PropertyGridUtilities.GetAttibuteEditor( propertyItem );
 
-            //now look for a custom editor based on editor definitions
-            if (editor == null)
-                editor = PropertyGridUtilities.GetCustomEditor(propertyItem, editorDefinitions);
+      //now look for a custom editor based on editor definitions
+      if( editor == null )
+        editor = PropertyGridUtilities.GetCustomEditor( propertyItem, editorDefinitions );
 
-            //guess we have to use the default editor
-            if (editor == null)
-                editor = PropertyGridUtilities.CreateDefaultEditor(propertyItem);
+      //guess we have to use the default editor
+      if( editor == null )
+        editor = PropertyGridUtilities.CreateDefaultEditor( propertyItem );
 
-            return editor;
-        }
+      return editor;
+    }
+
+    internal static FrameworkElement GetAttibuteEditor( PropertyItem propertyItem )
+    {
+      FrameworkElement editor = null;
+
+      var itemsSourceAttribute = GetAttribute<ItemsSourceAttribute>( propertyItem.PropertyDescriptor );
+      if( itemsSourceAttribute != null )
+        editor = new ItemsSourceAttributeEditor( itemsSourceAttribute ).ResolveEditor( propertyItem );
+
+      var editorAttribute = GetAttribute<EditorAttribute>( propertyItem.PropertyDescriptor );
+      if( editorAttribute != null )
+      {
+        Type type = Type.GetType( editorAttribute.EditorTypeName );
+        var instance = Activator.CreateInstance( type );
+        if( instance is ITypeEditor )
+          editor = ( instance as ITypeEditor ).ResolveEditor( propertyItem );
+      }
+
+      return editor;
+    }
 
-        internal static FrameworkElement GetAttibuteEditor(PropertyItem propertyItem)
+    internal static FrameworkElement GetCustomEditor( PropertyItem propertyItem, EditorDefinitionCollection customTypeEditors )
+    {
+      FrameworkElement editor = null;
+
+      //check for custom editor
+      if( customTypeEditors.Count > 0 )
+      {
+        //first check if the custom editor is type based
+        EditorDefinition customEditor = customTypeEditors[ propertyItem.PropertyType ];
+        if( customEditor == null )
         {
-            FrameworkElement editor = null;
-
-            var itemsSourceAttribute = GetAttribute<ItemsSourceAttribute>(propertyItem.PropertyDescriptor);
-            if (itemsSourceAttribute != null)
-                editor = new ItemsSourceAttributeEditor(itemsSourceAttribute).ResolveEditor(propertyItem);
-
-            var editorAttribute = GetAttribute<EditorAttribute>(propertyItem.PropertyDescriptor);
-            if (editorAttribute != null)
-            {
-                Type type = Type.GetType(editorAttribute.EditorTypeName);
-                var instance = Activator.CreateInstance(type);
-                if (instance is ITypeEditor)
-                    editor = (instance as ITypeEditor).ResolveEditor(propertyItem);
-            }
-
-            return editor;
+          //must be property based
+          customEditor = customTypeEditors[ propertyItem.Name ];
         }
 
-        internal static FrameworkElement GetCustomEditor(PropertyItem propertyItem, EditorDefinitionCollection customTypeEditors)
+        if( customEditor != null )
         {
-            FrameworkElement editor = null;
-
-            //check for custom editor
-            if (customTypeEditors.Count > 0)
-            {
-                //first check if the custom editor is type based
-                EditorDefinition customEditor = customTypeEditors[propertyItem.PropertyType];
-                if (customEditor == null)
-                {
-                    //must be property based
-                    customEditor = customTypeEditors[propertyItem.Name];
-                }
-
-                if (customEditor != null)
-                {
-                    if (customEditor.EditorTemplate != null)
-                        editor = customEditor.EditorTemplate.LoadContent() as FrameworkElement;
-                }
-            }
-
-            return editor;
+          if( customEditor.EditorTemplate != null )
+            editor = customEditor.EditorTemplate.LoadContent() as FrameworkElement;
         }
+      }
+
+      return editor;
+    }
 
-        internal static FrameworkElement CreateDefaultEditor(PropertyItem propertyItem)
+    internal static FrameworkElement CreateDefaultEditor( PropertyItem propertyItem )
+    {
+      ITypeEditor editor = null;
+
+      if( propertyItem.IsReadOnly )
+        editor = new TextBlockEditor();
+      else if( propertyItem.PropertyType == typeof( bool ) || propertyItem.PropertyType == typeof( bool? ) )
+        editor = new CheckBoxEditor();
+      else if( propertyItem.PropertyType == typeof( decimal ) || propertyItem.PropertyType == typeof( decimal? ) )
+        editor = new DecimalUpDownEditor();
+      else if( propertyItem.PropertyType == typeof( double ) || propertyItem.PropertyType == typeof( double? ) )
+        editor = new DoubleUpDownEditor();
+      else if( propertyItem.PropertyType == typeof( int ) || propertyItem.PropertyType == typeof( int? ) )
+        editor = new IntegerUpDownEditor();
+      else if( propertyItem.PropertyType == typeof( DateTime ) || propertyItem.PropertyType == typeof( DateTime? ) )
+        editor = new DateTimeUpDownEditor();
+      else if( ( propertyItem.PropertyType == typeof( Color ) ) )
+        editor = new ColorEditor();
+      else if( propertyItem.PropertyType.IsEnum )
+        editor = new EnumComboBoxEditor();
+      else if( propertyItem.PropertyType == typeof( TimeSpan ) )
+        editor = new TimeSpanEditor();
+      else if( propertyItem.PropertyType == typeof( FontFamily ) || propertyItem.PropertyType == typeof( FontWeight ) || propertyItem.PropertyType == typeof( FontStyle ) || propertyItem.PropertyType == typeof( FontStretch ) )
+        editor = new FontComboBoxEditor();
+      else if( propertyItem.PropertyType.IsGenericType )
+      {
+        if( propertyItem.PropertyType.GetInterface( "IList" ) != null )
         {
-            ITypeEditor editor = null;
-
-            if (propertyItem.IsReadOnly)
-                editor = new TextBlockEditor();
-            else if (propertyItem.PropertyType == typeof(bool) || propertyItem.PropertyType == typeof(bool?))
-                editor = new CheckBoxEditor();
-            else if (propertyItem.PropertyType == typeof(decimal) || propertyItem.PropertyType == typeof(decimal?))
-                editor = new DecimalUpDownEditor();
-            else if (propertyItem.PropertyType == typeof(double) || propertyItem.PropertyType == typeof(double?))
-                editor = new DoubleUpDownEditor();
-            else if (propertyItem.PropertyType == typeof(int) || propertyItem.PropertyType == typeof(int?))
-                editor = new IntegerUpDownEditor();
-            else if (propertyItem.PropertyType == typeof(DateTime) || propertyItem.PropertyType == typeof(DateTime?))
-                editor = new DateTimeUpDownEditor();
-            else if ((propertyItem.PropertyType == typeof(Color)))
-                editor = new ColorEditor();
-            else if (propertyItem.PropertyType.IsEnum)
-                editor = new EnumComboBoxEditor();
-            else if (propertyItem.PropertyType == typeof(TimeSpan))
-                editor = new TimeSpanEditor();
-            else if (propertyItem.PropertyType == typeof(FontFamily) || propertyItem.PropertyType == typeof(FontWeight) || propertyItem.PropertyType == typeof(FontStyle) || propertyItem.PropertyType == typeof(FontStretch))
-                editor = new FontComboBoxEditor();
-            else if (propertyItem.PropertyType.IsGenericType)
-            {
-                if (propertyItem.PropertyType.GetInterface("IList") != null)
-                {
-                    var t = propertyItem.PropertyType.GetGenericArguments()[0];
-                    if (!t.IsPrimitive && !t.Equals(typeof(String)))
-                        editor = new Microsoft.Windows.Controls.PropertyGrid.Editors.CollectionEditor();
-                    else
-                        editor = new Microsoft.Windows.Controls.PropertyGrid.Editors.PrimitiveTypeCollectionEditor();
-                }
-                else
-                    editor = new TextBlockEditor();
-            }
-            else
-                editor = new TextBoxEditor();
-
-            return editor.ResolveEditor(propertyItem);
+          var t = propertyItem.PropertyType.GetGenericArguments()[ 0 ];
+          if( !t.IsPrimitive && !t.Equals( typeof( String ) ) )
+            editor = new Microsoft.Windows.Controls.PropertyGrid.Editors.CollectionEditor();
+          else
+            editor = new Microsoft.Windows.Controls.PropertyGrid.Editors.PrimitiveTypeCollectionEditor();
         }
+        else
+          editor = new TextBlockEditor();
+      }
+      else
+        editor = new TextBoxEditor();
+
+      return editor.ResolveEditor( propertyItem );
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs
index b8ed4e7c..2f13038f 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItem.cs
@@ -1,4 +1,22 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
@@ -7,424 +25,507 @@ using System.Windows.Controls;
 using System.Windows.Data;
 using System.Windows.Input;
 using System.Windows.Markup.Primitives;
-using Microsoft.Windows.Controls.PropertyGrid.Commands;
 using Microsoft.Windows.Controls.PropertyGrid.Attributes;
+using Microsoft.Windows.Controls.PropertyGrid.Commands;
 
 namespace Microsoft.Windows.Controls.PropertyGrid
 {
-    public class PropertyItem : Control
-    {
-        #region Members
+  public class PropertyItem : Control
+  {
+    #region Members
 
-        private DependencyPropertyDescriptor _dpDescriptor;
-        private MarkupObject _markupObject;
+    private DependencyPropertyDescriptor _dpDescriptor;
+    private MarkupObject _markupObject;
 
-        #endregion //Members
+    #endregion //Members
 
-        #region Properties
+    #region Properties
 
-        public string BindingPath { get; private set; }
+    public string BindingPath
+    {
+      get;
+      private set;
+    }
 
-        #region Category
+    #region Category
 
-        public static readonly DependencyProperty CategoryProperty = DependencyProperty.Register("Category", typeof(string), typeof(PropertyItem), new UIPropertyMetadata(string.Empty));
-        public string Category
-        {
-            get { return (string)GetValue(CategoryProperty); }
-            set { SetValue(CategoryProperty, value); }
-        }
+    public static readonly DependencyProperty CategoryProperty = DependencyProperty.Register( "Category", typeof( string ), typeof( PropertyItem ), new UIPropertyMetadata( string.Empty ) );
+    public string Category
+    {
+      get
+      {
+        return ( string )GetValue( CategoryProperty );
+      }
+      set
+      {
+        SetValue( CategoryProperty, value );
+      }
+    }
 
-        #endregion //Category
+    #endregion //Category
 
-        #region Description
+    #region Description
 
-        public string Description
-        {
-            get { return PropertyDescriptor.Description; }
-        }
+    public string Description
+    {
+      get
+      {
+        return PropertyDescriptor.Description;
+      }
+    }
 
-        #endregion //Description
+    #endregion //Description
 
-        #region DisplayName
+    #region DisplayName
 
-        public static readonly DependencyProperty DisplayNameProperty = DependencyProperty.Register("DisplayName", typeof(string), typeof(PropertyItem), new UIPropertyMetadata(null));
-        public string DisplayName
-        {
-            get { return (string)GetValue(DisplayNameProperty); }
-            set { SetValue(DisplayNameProperty, value); }
-        }
+    public static readonly DependencyProperty DisplayNameProperty = DependencyProperty.Register( "DisplayName", typeof( string ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
+    public string DisplayName
+    {
+      get
+      {
+        return ( string )GetValue( DisplayNameProperty );
+      }
+      set
+      {
+        SetValue( DisplayNameProperty, value );
+      }
+    }
 
-        #endregion //DisplayName
+    #endregion //DisplayName
 
-        #region Editor
+    #region Editor
 
-        public static readonly DependencyProperty EditorProperty = DependencyProperty.Register("Editor", typeof(FrameworkElement), typeof(PropertyItem), new UIPropertyMetadata(null, OnEditorChanged));
-        public FrameworkElement Editor
-        {
-            get { return (FrameworkElement)GetValue(EditorProperty); }
-            set { SetValue(EditorProperty, value); }
-        }
+    public static readonly DependencyProperty EditorProperty = DependencyProperty.Register( "Editor", typeof( FrameworkElement ), typeof( PropertyItem ), new UIPropertyMetadata( null, OnEditorChanged ) );
+    public FrameworkElement Editor
+    {
+      get
+      {
+        return ( FrameworkElement )GetValue( EditorProperty );
+      }
+      set
+      {
+        SetValue( EditorProperty, value );
+      }
+    }
 
-        private static void OnEditorChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PropertyItem propertyItem = o as PropertyItem;
-            if (propertyItem != null)
-                propertyItem.OnEditorChanged((FrameworkElement)e.OldValue, (FrameworkElement)e.NewValue);
-        }
+    private static void OnEditorChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+        propertyItem.OnEditorChanged( ( FrameworkElement )e.OldValue, ( FrameworkElement )e.NewValue );
+    }
 
-        protected virtual void OnEditorChanged(FrameworkElement oldValue, FrameworkElement newValue)
-        {
-            if (oldValue != null)
-                oldValue.DataContext = null;
+    protected virtual void OnEditorChanged( FrameworkElement oldValue, FrameworkElement newValue )
+    {
+      if( oldValue != null )
+        oldValue.DataContext = null;
 
-            if (newValue != null)
-                newValue.DataContext = this;
-        }
+      if( newValue != null )
+        newValue.DataContext = this;
+    }
 
-        #endregion //Editor
+    #endregion //Editor
 
-        #region Instance
+    #region Instance
 
-        private object _instance;
-        public object Instance
-        {
-            get { return _instance; }
-            private set
-            {
-                _instance = value;
-                _markupObject = MarkupWriter.GetMarkupObjectFor(_instance);
-            }
-        }
+    private object _instance;
+    public object Instance
+    {
+      get
+      {
+        return _instance;
+      }
+      private set
+      {
+        _instance = value;
+        _markupObject = MarkupWriter.GetMarkupObjectFor( _instance );
+      }
+    }
 
-        #endregion //Instance
+    #endregion //Instance
 
-        #region IsDataBound
+    #region IsDataBound
 
-        /// <summary>
-        /// Gets if the property is data bound
-        /// </summary>
-        public bool IsDataBound
-        {
-            get
-            {
-                var dependencyObject = Instance as DependencyObject;
-                if (dependencyObject != null && _dpDescriptor != null)
-                    return BindingOperations.GetBindingExpressionBase(dependencyObject, _dpDescriptor.DependencyProperty) != null;
-
-                return false;
-            }
-        }
+    /// <summary>
+    /// Gets if the property is data bound
+    /// </summary>
+    public bool IsDataBound
+    {
+      get
+      {
+        var dependencyObject = Instance as DependencyObject;
+        if( dependencyObject != null && _dpDescriptor != null )
+          return BindingOperations.GetBindingExpressionBase( dependencyObject, _dpDescriptor.DependencyProperty ) != null;
+
+        return false;
+      }
+    }
 
-        #endregion //IsDataBound
+    #endregion //IsDataBound
 
-        #region IsDynamicResource
+    #region IsDynamicResource
 
-        public bool IsDynamicResource
-        {
-            get
-            {
-                var markupProperty = _markupObject.Properties.Where(p => p.Name == PropertyDescriptor.Name).FirstOrDefault();
-                if (markupProperty != null)
-                    return markupProperty.Value is DynamicResourceExtension;
-                return false;
-            }
-        }
+    public bool IsDynamicResource
+    {
+      get
+      {
+        var markupProperty = _markupObject.Properties.Where( p => p.Name == PropertyDescriptor.Name ).FirstOrDefault();
+        if( markupProperty != null )
+          return markupProperty.Value is DynamicResourceExtension;
+        return false;
+      }
+    }
 
-        #endregion //IsDynamicResource
+    #endregion //IsDynamicResource
 
-        #region IsExpanded
+    #region IsExpanded
 
-        public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register("IsExpanded", typeof(bool), typeof(PropertyItem), new UIPropertyMetadata(false, OnIsExpandedChanged));
-        public bool IsExpanded
-        {
-            get { return (bool)GetValue(IsExpandedProperty); }
-            set { SetValue(IsExpandedProperty, value); }
-        }
+    public static readonly DependencyProperty IsExpandedProperty = DependencyProperty.Register( "IsExpanded", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false, OnIsExpandedChanged ) );
+    public bool IsExpanded
+    {
+      get
+      {
+        return ( bool )GetValue( IsExpandedProperty );
+      }
+      set
+      {
+        SetValue( IsExpandedProperty, value );
+      }
+    }
 
-        private static void OnIsExpandedChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PropertyItem propertyItem = o as PropertyItem;
-            if (propertyItem != null)
-                propertyItem.OnIsExpandedChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
+    private static void OnIsExpandedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+        propertyItem.OnIsExpandedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
 
-        protected virtual void OnIsExpandedChanged(bool oldValue, bool newValue)
-        {
-            if (newValue && (Properties == null || Properties.Count == 0))
-            {
-                GetChildProperties();
-            }
-        }
+    protected virtual void OnIsExpandedChanged( bool oldValue, bool newValue )
+    {
+      if( newValue && ( Properties == null || Properties.Count == 0 ) )
+      {
+        GetChildProperties();
+      }
+    }
 
-        #endregion IsExpanded
+    #endregion IsExpanded
 
-        #region HasChildProperties
+    #region HasChildProperties
 
-        public static readonly DependencyProperty HasChildPropertiesProperty = DependencyProperty.Register("HasChildProperties", typeof(bool), typeof(PropertyItem), new UIPropertyMetadata(false));
-        public bool HasChildProperties
-        {
-            get { return (bool)GetValue(HasChildPropertiesProperty); }
-            set { SetValue(HasChildPropertiesProperty, value); }
-        }
+    public static readonly DependencyProperty HasChildPropertiesProperty = DependencyProperty.Register( "HasChildProperties", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false ) );
+    public bool HasChildProperties
+    {
+      get
+      {
+        return ( bool )GetValue( HasChildPropertiesProperty );
+      }
+      set
+      {
+        SetValue( HasChildPropertiesProperty, value );
+      }
+    }
 
-        #endregion HasChildProperties
+    #endregion HasChildProperties
 
-        #region HasResourceApplied
+    #region HasResourceApplied
 
-        public bool HasResourceApplied
-        {
-            //TODO: need to find a better way to determine if a StaticResource has been applied to any property not just a style
-            get
-            {
-                var markupProperty = _markupObject.Properties.Where(p => p.Name == PropertyDescriptor.Name).FirstOrDefault();
-                if (markupProperty != null)
-                    return markupProperty.Value is Style;
-
-                return false;
-            }
-        }
+    public bool HasResourceApplied
+    {
+      //TODO: need to find a better way to determine if a StaticResource has been applied to any property not just a style
+      get
+      {
+        var markupProperty = _markupObject.Properties.Where( p => p.Name == PropertyDescriptor.Name ).FirstOrDefault();
+        if( markupProperty != null )
+          return markupProperty.Value is Style;
+
+        return false;
+      }
+    }
 
-        #endregion //HasResourceApplied
+    #endregion //HasResourceApplied
 
-        public bool IsReadOnly { get; private set; }
+    public bool IsReadOnly
+    {
+      get;
+      private set;
+    }
 
-        #region IsSelected
+    #region IsSelected
 
-        public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register("IsSelected", typeof(bool), typeof(PropertyItem), new UIPropertyMetadata(false, OnIsSelectedChanged));
-        public bool IsSelected
-        {
-            get { return (bool)GetValue(IsSelectedProperty); }
-            set { SetValue(IsSelectedProperty, value); }
-        }
+    public static readonly DependencyProperty IsSelectedProperty = DependencyProperty.Register( "IsSelected", typeof( bool ), typeof( PropertyItem ), new UIPropertyMetadata( false, OnIsSelectedChanged ) );
+    public bool IsSelected
+    {
+      get
+      {
+        return ( bool )GetValue( IsSelectedProperty );
+      }
+      set
+      {
+        SetValue( IsSelectedProperty, value );
+      }
+    }
 
-        private static void OnIsSelectedChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PropertyItem propertyItem = o as PropertyItem;
-            if (propertyItem != null)
-                propertyItem.OnIsSelectedChanged((bool)e.OldValue, (bool)e.NewValue);
-        }
+    private static void OnIsSelectedChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+        propertyItem.OnIsSelectedChanged( ( bool )e.OldValue, ( bool )e.NewValue );
+    }
 
-        protected virtual void OnIsSelectedChanged(bool oldValue, bool newValue)
-        {
-            if (newValue)
-                PropertyGrid.SelectedProperty = this; 
-        }
+    protected virtual void OnIsSelectedChanged( bool oldValue, bool newValue )
+    {
+      if( newValue )
+        PropertyGrid.SelectedProperty = this;
+    }
 
-        #endregion //IsSelected
+    #endregion //IsSelected
 
-        #region Level
+    #region Level
 
-        public static readonly DependencyProperty LevelProperty = DependencyProperty.Register("Level", typeof(int), typeof(PropertyItem), new UIPropertyMetadata(0));
-        public int Level
-        {
-            get { return (int)GetValue(LevelProperty); }
-            set { SetValue(LevelProperty, value); }
-        }
+    public static readonly DependencyProperty LevelProperty = DependencyProperty.Register( "Level", typeof( int ), typeof( PropertyItem ), new UIPropertyMetadata( 0 ) );
+    public int Level
+    {
+      get
+      {
+        return ( int )GetValue( LevelProperty );
+      }
+      set
+      {
+        SetValue( LevelProperty, value );
+      }
+    }
 
-        #endregion //Level
+    #endregion //Level
 
-        #region Properties
+    #region Properties
 
-        public static readonly DependencyProperty PropertiesProperty = DependencyProperty.Register("Properties", typeof(PropertyItemCollection), typeof(PropertyItem), new UIPropertyMetadata(null));
-        public PropertyItemCollection Properties
-        {
-            get { return (PropertyItemCollection)GetValue(PropertiesProperty); }
-            set { SetValue(PropertiesProperty, value); }
-        }
+    public static readonly DependencyProperty PropertiesProperty = DependencyProperty.Register( "Properties", typeof( PropertyItemCollection ), typeof( PropertyItem ), new UIPropertyMetadata( null ) );
+    public PropertyItemCollection Properties
+    {
+      get
+      {
+        return ( PropertyItemCollection )GetValue( PropertiesProperty );
+      }
+      set
+      {
+        SetValue( PropertiesProperty, value );
+      }
+    }
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region PropertyDescriptor
+    #region PropertyDescriptor
 
-        private PropertyDescriptor _propertyDescriptor;
-        public PropertyDescriptor PropertyDescriptor
-        {
-            get
-            {
-                return _propertyDescriptor;
-            }
-            private set
-            {
-                _propertyDescriptor = value;
-                _dpDescriptor = DependencyPropertyDescriptor.FromProperty(_propertyDescriptor);
-            }
-        }
+    private PropertyDescriptor _propertyDescriptor;
+    public PropertyDescriptor PropertyDescriptor
+    {
+      get
+      {
+        return _propertyDescriptor;
+      }
+      private set
+      {
+        _propertyDescriptor = value;
+        _dpDescriptor = DependencyPropertyDescriptor.FromProperty( _propertyDescriptor );
+      }
+    }
 
-        #endregion //PropertyDescriptor
+    #endregion //PropertyDescriptor
 
-        public PropertyGrid PropertyGrid { get; private set; }
+    public PropertyGrid PropertyGrid
+    {
+      get;
+      private set;
+    }
 
-        public int PropertyOrder { get; set; } //maybe make a DP
+    public int PropertyOrder
+    {
+      get;
+      set;
+    } //maybe make a DP
 
-        #region PropertyType
+    #region PropertyType
 
-        public Type PropertyType
-        {
-            get { return PropertyDescriptor.PropertyType; }
-        }
+    public Type PropertyType
+    {
+      get
+      {
+        return PropertyDescriptor.PropertyType;
+      }
+    }
 
-        #endregion //PropertyType
+    #endregion //PropertyType
 
-        public ICommand ResetValueCommand { get; private set; }
+    public ICommand ResetValueCommand
+    {
+      get;
+      private set;
+    }
 
-        #region Value
+    #region Value
 
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register("Value", typeof(object), typeof(PropertyItem), new UIPropertyMetadata(null, OnValueChanged));
-        public object Value
-        {
-            get { return (object)GetValue(ValueProperty); }
-            set { SetValue(ValueProperty, value); }
-        }
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( object ), typeof( PropertyItem ), new UIPropertyMetadata( null, OnValueChanged ) );
+    public object Value
+    {
+      get
+      {
+        return ( object )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
 
-        private static void OnValueChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            PropertyItem propertyItem = o as PropertyItem;
-            if (propertyItem != null)
-                propertyItem.OnValueChanged((object)e.OldValue, (object)e.NewValue);
-        }
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      PropertyItem propertyItem = o as PropertyItem;
+      if( propertyItem != null )
+        propertyItem.OnValueChanged( ( object )e.OldValue, ( object )e.NewValue );
+    }
 
-        protected virtual void OnValueChanged(object oldValue, object newValue)
-        {
-            if (IsInitialized)
-            {
-                PropertyGrid.RaiseEvent(new PropertyValueChangedEventArgs(PropertyGrid.PropertyValueChangedEvent, this, oldValue, newValue));
-            }
-        }
+    protected virtual void OnValueChanged( object oldValue, object newValue )
+    {
+      if( IsInitialized )
+      {
+        PropertyGrid.RaiseEvent( new PropertyValueChangedEventArgs( PropertyGrid.PropertyValueChangedEvent, this, oldValue, newValue ) );
+      }
+    }
 
-        #endregion //Value
+    #endregion //Value
 
-        #region ValueSource
+    #region ValueSource
 
-        /// <summary>
-        /// Gets the value source.
-        /// </summary>
-        public BaseValueSource ValueSource
-        {
-            get
-            {
-                var dependencyObject = Instance as DependencyObject;
-                if (_dpDescriptor != null && dependencyObject != null)
-                    return DependencyPropertyHelper.GetValueSource(dependencyObject, _dpDescriptor.DependencyProperty).BaseValueSource;
-
-                return BaseValueSource.Unknown;
-            }
-        }
+    /// <summary>
+    /// Gets the value source.
+    /// </summary>
+    public BaseValueSource ValueSource
+    {
+      get
+      {
+        var dependencyObject = Instance as DependencyObject;
+        if( _dpDescriptor != null && dependencyObject != null )
+          return DependencyPropertyHelper.GetValueSource( dependencyObject, _dpDescriptor.DependencyProperty ).BaseValueSource;
+
+        return BaseValueSource.Unknown;
+      }
+    }
 
-        #endregion //ValueSource
+    #endregion //ValueSource
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region Constructors
+    #region Constructors
 
-        static PropertyItem()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(PropertyItem), new FrameworkPropertyMetadata(typeof(PropertyItem)));
-        }
+    static PropertyItem()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( PropertyItem ), new FrameworkPropertyMetadata( typeof( PropertyItem ) ) );
+    }
 
-        public PropertyItem(object instance, PropertyDescriptor property, PropertyGrid propertyGrid, string bindingPath)
-        {
-            PropertyDescriptor = property;
-            PropertyGrid = propertyGrid;
-            Instance = instance;
-            BindingPath = bindingPath;
+    public PropertyItem( object instance, PropertyDescriptor property, PropertyGrid propertyGrid, string bindingPath )
+    {
+      PropertyDescriptor = property;
+      PropertyGrid = propertyGrid;
+      Instance = instance;
+      BindingPath = bindingPath;
 
-            SetPropertyDescriptorProperties();
-            ResolveExpandableObject();
-            ResolvePropertyOrder();
+      SetPropertyDescriptorProperties();
+      ResolveExpandableObject();
+      ResolvePropertyOrder();
 
-            CommandBindings.Add(new CommandBinding(PropertyItemCommands.ResetValue, ExecuteResetValueCommand, CanExecuteResetValueCommand));
-            AddHandler(Mouse.PreviewMouseDownEvent, new MouseButtonEventHandler(PropertyItem_PreviewMouseDown), true);
-        }
+      CommandBindings.Add( new CommandBinding( PropertyItemCommands.ResetValue, ExecuteResetValueCommand, CanExecuteResetValueCommand ) );
+      AddHandler( Mouse.PreviewMouseDownEvent, new MouseButtonEventHandler( PropertyItem_PreviewMouseDown ), true );
+    }
 
-        #endregion //Constructors
+    #endregion //Constructors
 
-        #region Event Handlers
+    #region Event Handlers
 
-        void PropertyItem_PreviewMouseDown(object sender, MouseButtonEventArgs e)
-        {
-            IsSelected = true;
-        }
+    void PropertyItem_PreviewMouseDown( object sender, MouseButtonEventArgs e )
+    {
+      IsSelected = true;
+    }
 
-        #endregion  //Event Handlers
+    #endregion  //Event Handlers
 
-        #region Commands
+    #region Commands
 
-        private void ExecuteResetValueCommand(object sender, ExecutedRoutedEventArgs e)
-        {
-            if (PropertyDescriptor.CanResetValue(Instance))
-                PropertyDescriptor.ResetValue(Instance);
+    private void ExecuteResetValueCommand( object sender, ExecutedRoutedEventArgs e )
+    {
+      if( PropertyDescriptor.CanResetValue( Instance ) )
+        PropertyDescriptor.ResetValue( Instance );
 
-            //TODO: notify UI that the ValueSource may have changed to update the icon
-        }
+      //TODO: notify UI that the ValueSource may have changed to update the icon
+    }
 
-        private void CanExecuteResetValueCommand(object sender, CanExecuteRoutedEventArgs e)
-        {
-            bool canExecute = false;
+    private void CanExecuteResetValueCommand( object sender, CanExecuteRoutedEventArgs e )
+    {
+      bool canExecute = false;
 
-            if (PropertyDescriptor.CanResetValue(Instance) && !PropertyDescriptor.IsReadOnly)
-            {
-                canExecute = true;
-            }
+      if( PropertyDescriptor.CanResetValue( Instance ) && !PropertyDescriptor.IsReadOnly )
+      {
+        canExecute = true;
+      }
 
-            e.CanExecute = canExecute;
-        }
+      e.CanExecute = canExecute;
+    }
 
-        #endregion //Commands
+    #endregion //Commands
 
-        #region Methods
+    #region Methods
 
-        private void GetChildProperties()
-        {
-            if (Value == null)
-                return;
-
-            var propertyItems = new List<PropertyItem>();
-
-            try
-            {
-                PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors(Value);
-
-                foreach (PropertyDescriptor descriptor in descriptors)
-                {
-                    if (descriptor.IsBrowsable)
-                        propertyItems.Add(PropertyGridUtilities.CreatePropertyItem(descriptor, Instance, PropertyGrid, String.Format("{0}.{1}", BindingPath, descriptor.Name), Level + 1));
-                }
-            }
-            catch (Exception)
-            {
-                //TODO: handle this some how
-            }
-
-            Properties = PropertyGridUtilities.GetAlphabetizedProperties(propertyItems);
-        }
+    private void GetChildProperties()
+    {
+      if( Value == null )
+        return;
 
-        private void ResolveExpandableObject()
-        {
-            var attribute = PropertyGridUtilities.GetAttribute<ExpandableObjectAttribute>(PropertyDescriptor);
-            if (attribute != null)
-            {
-                HasChildProperties = true;
-                IsReadOnly = true;
-            }
-        }
+      var propertyItems = new List<PropertyItem>();
 
-        private void ResolvePropertyOrder()
-        {
-            var attrs = PropertyDescriptor.Attributes.OfType<PropertyOrderAttribute>();
-            if (attrs.Any())
-                PropertyOrder = attrs.First().Order;
-            else
-                PropertyOrder = 0;
-        }
+      try
+      {
+        PropertyDescriptorCollection descriptors = PropertyGridUtilities.GetPropertyDescriptors( Value );
 
-        private void SetPropertyDescriptorProperties()
+        foreach( PropertyDescriptor descriptor in descriptors )
         {
-            Name = PropertyDescriptor.Name;
-            DisplayName = PropertyDescriptor.DisplayName;
-            Category = PropertyDescriptor.Category;
-            IsReadOnly = PropertyDescriptor.IsReadOnly;
+          if( descriptor.IsBrowsable )
+            propertyItems.Add( PropertyGridUtilities.CreatePropertyItem( descriptor, Instance, PropertyGrid, String.Format( "{0}.{1}", BindingPath, descriptor.Name ), Level + 1 ) );
         }
+      }
+      catch( Exception )
+      {
+        //TODO: handle this some how
+      }
 
-        #endregion //Methods
+      Properties = PropertyGridUtilities.GetAlphabetizedProperties( propertyItems );
     }
+
+    private void ResolveExpandableObject()
+    {
+      var attribute = PropertyGridUtilities.GetAttribute<ExpandableObjectAttribute>( PropertyDescriptor );
+      if( attribute != null )
+      {
+        HasChildProperties = true;
+        IsReadOnly = true;
+      }
+    }
+
+    private void ResolvePropertyOrder()
+    {
+      var attrs = PropertyDescriptor.Attributes.OfType<PropertyOrderAttribute>();
+      if( attrs.Any() )
+        PropertyOrder = attrs.First().Order;
+      else
+        PropertyOrder = 0;
+    }
+
+    private void SetPropertyDescriptorProperties()
+    {
+      Name = PropertyDescriptor.Name;
+      DisplayName = PropertyDescriptor.DisplayName;
+      Category = PropertyDescriptor.Category;
+      IsReadOnly = PropertyDescriptor.IsReadOnly;
+    }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs
index 5dd59f34..d993e5f4 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Implementation/PropertyItemCollection.cs
@@ -1,4 +1,21 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
@@ -6,49 +23,49 @@ using System.Windows.Data;
 
 namespace Microsoft.Windows.Controls.PropertyGrid
 {
-    public class PropertyItemCollection : ObservableCollection<PropertyItem>
+  public class PropertyItemCollection : ObservableCollection<PropertyItem>
+  {
+    public PropertyItemCollection()
+    {
+
+    }
+
+    public PropertyItemCollection( List<PropertyItem> list )
+      : base( list )
     {
-        public PropertyItemCollection()
-        {
-            
-        }
-
-        public PropertyItemCollection(List<PropertyItem> list)
-            : base(list)
-        {
-            
-        }
-        public PropertyItemCollection(IEnumerable<PropertyItem> collection)
-            : base(collection)
-        {
-                        
-        }
-
-        private ICollectionView GetDefaultView()
-        {
-            return CollectionViewSource.GetDefaultView(this);
-        }
-
-        public void GroupBy(string name)
-        {
-            GetDefaultView().GroupDescriptions.Add(new PropertyGroupDescription(name));
-        }
-
-        public void SortBy(string name, ListSortDirection sortDirection)
-        {
-            GetDefaultView().SortDescriptions.Add(new SortDescription(name, sortDirection));
-        }
-
-        public void Filter(string text)
-        {
-            if (text == null)
-                return;
-
-            GetDefaultView().Filter = (item) => 
-            {
-                var property = item as PropertyItem;
-                return property.DisplayName.ToLower().StartsWith(text.ToLower());
-            };
-        }
+
+    }
+    public PropertyItemCollection( IEnumerable<PropertyItem> collection )
+      : base( collection )
+    {
+
+    }
+
+    private ICollectionView GetDefaultView()
+    {
+      return CollectionViewSource.GetDefaultView( this );
+    }
+
+    public void GroupBy( string name )
+    {
+      GetDefaultView().GroupDescriptions.Add( new PropertyGroupDescription( name ) );
+    }
+
+    public void SortBy( string name, ListSortDirection sortDirection )
+    {
+      GetDefaultView().SortDescriptions.Add( new SortDescription( name, sortDirection ) );
+    }
+
+    public void Filter( string text )
+    {
+      if( text == null )
+        return;
+
+      GetDefaultView().Filter = ( item ) =>
+      {
+        var property = item as PropertyItem;
+        return property.DisplayName.ToLower().StartsWith( text.ToLower() );
+      };
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml
index 95e8b0f5..57f43170 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml
@@ -1,4 +1,22 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:extToolkit="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls.PropertyGrid"
@@ -7,498 +25,513 @@
                     xmlns:utilities="clr-namespace:Microsoft.Windows.Controls.Core.Utilities"
                     xmlns:commands="clr-namespace:Microsoft.Windows.Controls.PropertyGrid.Commands">
 
-    <!-- =============================================================================== -->
-    <!-- PropertyGrid                                                                    -->
-    <!-- =============================================================================== -->
-
-    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-    <converters:InverseBoolConverter x:Key="InverseBoolConverter" />
-    <pgConverters:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
-    <pgConverters:ValueSourceToImagePathConverter x:Key="ValueSourceToImagePathConverter" />
-    <pgConverters:ValueSourceToToolTipConverter x:Key="ValueSourceToToolTipConverter" />
-
-    <SolidColorBrush x:Key="MouseOverBorderBrush" Color="#FFFFB700" />
-    <LinearGradientBrush x:Key="MouseOverBackgroundBrush" StartPoint="0,0" EndPoint="0,1" >
-        <GradientStop Offset="0" Color="#FFFEFBF4" />
-        <GradientStop Offset="0.19" Color="#FFFDE7CE" />
-        <GradientStop Offset="0.39" Color="#FFFDDEB8" />
-        <GradientStop Offset="0.39" Color="#FFFFCE6B" />
-        <GradientStop Offset="0.79" Color="#FFFFDE9A" />
-        <GradientStop Offset="1" Color="#FFFFEBAA" />
-    </LinearGradientBrush>
-
-    <SolidColorBrush x:Key="CheckedBorderBrush" Color="#FFC29B29" />
-    <LinearGradientBrush x:Key="CheckedBackgroundBrush" StartPoint="0,0" EndPoint="0,1" >
-        <GradientStop Offset="0" Color="#FFFFDCA0" />
-        <GradientStop Offset="0.18" Color="#FFFFD692" />
-        <GradientStop Offset="0.39" Color="#FFFFC45D" />
-        <GradientStop Offset="1" Color="#FFFFD178" />
-    </LinearGradientBrush>
-
-    <SolidColorBrush x:Key="PressedBorderBrush" Color="#FFC29B29" />
-    <LinearGradientBrush x:Key="PressedBackgroundBrush" StartPoint="0,0" EndPoint="0,1" >
-        <GradientStop Offset="0" Color="#FFE3C085" />
-        <GradientStop Offset="0.19" Color="#FFF4CC89" />
-        <GradientStop Offset="0.36" Color="#FFF5C777" />
-        <GradientStop Offset="0.36" Color="#FFF5BB56" />
-        <GradientStop Offset="0.79" Color="#FFF4CE9A" />
-        <GradientStop Offset="1" Color="#FFF3E28D" />
-    </LinearGradientBrush>
-
-    <Style x:Key="OptionsToggleButtonStyle" TargetType="{x:Type RadioButton}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Height" Value="22" />
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="ToolTipService.InitialShowDelay" Value="900"/>
-        <Setter Property="ToolTipService.ShowDuration" Value="20000"/>
-        <Setter Property="ToolTipService.BetweenShowDelay" Value="0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RadioButton}">
-                    <Grid SnapsToDevicePixels="True">
-                        <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2"/>
-                        <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
-                            <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
-                                <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-                                    <ContentPresenter x:Name="Content" Content="{TemplateBinding Content}" Margin="1"
-                                           RenderOptions.BitmapScalingMode="NearestNeighbor"
+   <!-- =============================================================================== -->
+   <!-- PropertyGrid                                                                    -->
+   <!-- =============================================================================== -->
+
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+   <converters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <pgConverters:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
+   <pgConverters:ValueSourceToImagePathConverter x:Key="ValueSourceToImagePathConverter" />
+   <pgConverters:ValueSourceToToolTipConverter x:Key="ValueSourceToToolTipConverter" />
+
+   <SolidColorBrush x:Key="MouseOverBorderBrush" Color="#FFFFB700" />
+   <LinearGradientBrush x:Key="MouseOverBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Offset="0" Color="#FFFEFBF4" />
+      <GradientStop Offset="0.19" Color="#FFFDE7CE" />
+      <GradientStop Offset="0.39" Color="#FFFDDEB8" />
+      <GradientStop Offset="0.39" Color="#FFFFCE6B" />
+      <GradientStop Offset="0.79" Color="#FFFFDE9A" />
+      <GradientStop Offset="1" Color="#FFFFEBAA" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="CheckedBorderBrush" Color="#FFC29B29" />
+   <LinearGradientBrush x:Key="CheckedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Offset="0" Color="#FFFFDCA0" />
+      <GradientStop Offset="0.18" Color="#FFFFD692" />
+      <GradientStop Offset="0.39" Color="#FFFFC45D" />
+      <GradientStop Offset="1" Color="#FFFFD178" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="PressedBorderBrush" Color="#FFC29B29" />
+   <LinearGradientBrush x:Key="PressedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Offset="0" Color="#FFE3C085" />
+      <GradientStop Offset="0.19" Color="#FFF4CC89" />
+      <GradientStop Offset="0.36" Color="#FFF5C777" />
+      <GradientStop Offset="0.36" Color="#FFF5BB56" />
+      <GradientStop Offset="0.79" Color="#FFF4CE9A" />
+      <GradientStop Offset="1" Color="#FFF3E28D" />
+   </LinearGradientBrush>
+
+   <Style x:Key="OptionsToggleButtonStyle" TargetType="{x:Type RadioButton}">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Height" Value="22" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+      <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+      <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RadioButton}">
+               <Grid SnapsToDevicePixels="True">
+                  <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2" />
+                  <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                     <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                        <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                           <ContentPresenter x:Name="Content"
+                                             Content="{TemplateBinding Content}"
+                                             Margin="1"
+                                             RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                             VerticalAlignment="Center"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        </StackPanel>
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                  </Trigger>
+
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                     <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                  </Trigger>
+
+                  <Trigger Property="IsChecked" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder">
+                        <Setter.Value>
+                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                              <GradientStop Color="#FFE7CBAD" Offset="0" />
+                              <GradientStop Color="#FFF7D7B5" Offset="0.1" />
+                              <GradientStop Color="#FFFFD38C" Offset="0.36" />
+                              <GradientStop Color="#FFFFC75A" Offset="0.36" />
+                              <GradientStop Color="#FFFFEFA5" Offset="1" />
+                           </LinearGradientBrush>
+                        </Setter.Value>
+                     </Setter>
+                  </Trigger>
+
+                  <Trigger Property="IsPressed" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                  </Trigger>
+
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsChecked" Value="True" />
+                        <Condition Property="IsMouseOver" Value="True" />
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" TargetName="MiddleBorder">
+                        <Setter.Value>
+                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                              <GradientStop Color="#40FFFEFE" Offset="0" />
+                              <GradientStop Color="#40FFFEFE" Offset="0.39" />
+                              <GradientStop Color="#20FFCE68" Offset="0.39" />
+                              <GradientStop Color="#20FFCE68" Offset="0.69" />
+                              <GradientStop Color="#10FFFFFF" Offset="1" />
+                           </LinearGradientBrush>
+                        </Setter.Value>
+                     </Setter>
+                  </MultiTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ClearFilterButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Height" Value="22" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+      <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+      <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid SnapsToDevicePixels="True">
+                  <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2" />
+                  <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                     <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                        <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                           <ContentPresenter x:Name="Content"
+                                             Content="{TemplateBinding Content}"
+                                             Margin="1"
+                                             RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                             VerticalAlignment="Center"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        </StackPanel>
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                  </Trigger>
+
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                     <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                  </Trigger>
+
+                  <Trigger Property="IsPressed" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <SolidColorBrush x:Key="GlyphBrush" Color="#FF31347C" />
+
+   <ControlTemplate x:Key="ExpanderToggleButton" TargetType="{x:Type ToggleButton}">
+      <Grid>
+         <Rectangle Margin="0,0,0,0" x:Name="Rectangle" Fill="Transparent" />
+         <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" RenderTransformOrigin="0.5,0.5">
+            <Path.RenderTransform>
+               <TransformGroup>
+                  <ScaleTransform ScaleX="1" ScaleY="1" />
+                  <SkewTransform AngleX="0" AngleY="0" />
+                  <RotateTransform Angle="-90" />
+                  <TranslateTransform X="0" Y="0" />
+               </TransformGroup>
+            </Path.RenderTransform>
+         </Path>
+         <Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" RenderTransformOrigin="0.5,0.5">
+            <Path.RenderTransform>
+               <TransformGroup>
+                  <ScaleTransform ScaleX="1" ScaleY="1" />
+                  <SkewTransform AngleX="0" AngleY="0" />
+                  <RotateTransform Angle="135" />
+                  <TranslateTransform X="0" Y="0" />
+               </TransformGroup>
+            </Path.RenderTransform>
+         </Path>
+      </Grid>
+      <ControlTemplate.Triggers>
+         <Trigger Property="IsChecked" Value="true">
+            <Setter Property="Visibility" Value="Visible" TargetName="Down_Arrow" />
+            <Setter Property="Visibility" Value="Collapsed" TargetName="Up_Arrow" />
+            <Setter Property="OpacityMask" TargetName="Down_Arrow" Value="#FF000000" />
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <Style x:Key="ExpanderStyle" TargetType="{x:Type Expander}">
+      <Setter Property="Padding" Value="0" />
+      <Setter Property="Background" Value="#FFF0F0F0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Expander}">
+               <Grid>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto" />
+                     <RowDefinition Height="*" x:Name="ContentRow" />
+                  </Grid.RowDefinitions>
+                  <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="#FFF0F0F0">
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="20" />
+                           <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <ToggleButton Template="{StaticResource ExpanderToggleButton}" IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True" />
+                        <ContentPresenter Grid.Column="1" Margin="1" RecognizesAccessKey="True" ContentSource="Header" TextElement.FontWeight="Bold" />
+                     </Grid>
+                  </Border>
+                  <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Background="#FFF0F0F0" Padding="10 0 0 0">
+                     <Border Background="#FFFFFF" BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="false" />
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="True">
+                     <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="PropertyExpanderStyle" TargetType="{x:Type Expander}">
+      <Setter Property="Padding" Value="10 0 0 0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Expander}">
+               <Grid>
+                  <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Padding="0 0 0 0">
+                     <Border BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+												      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+												      Focusable="false" />
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="True">
+                     <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <ContextMenu x:Key="DefaultAdvancedOptionsMenu">
+      <MenuItem Header="Reset Value" Command="commands:PropertyItemCommands.ResetValue" />
+   </ContextMenu>
+
+   <Style TargetType="{x:Type local:PropertyItem}">
+      <Setter Property="BorderBrush" Value="#FFF0F0F0" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="True" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:PropertyItem}">
+               <Border Background="White" ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PropertyGrid}}" ContextMenuService.Placement="Bottom">
+                  <Grid VerticalAlignment="Center" HorizontalAlignment="Stretch">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PropertyGrid}}}" />
+                        <ColumnDefinition Width="*" />
+                     </Grid.ColumnDefinitions>
+                     <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                     </Grid.RowDefinitions>
+
+                     <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Name">
+                        <Grid Margin="2,2,2,2">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="*" />
+                              <ColumnDefinition Width="Auto" />
+                           </Grid.ColumnDefinitions>
+
+                           <Grid Margin="{Binding Level, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ExpandableObjectMarginConverter}}">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="15" />
+                                 <ColumnDefinition Width="*" />
+                              </Grid.ColumnDefinitions>
+
+                              <Border Grid.Column="0">
+                                 <ToggleButton Template="{StaticResource ExpanderToggleButton}"
+                                               OverridesDefaultStyle="True"
+                                               IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
+                                               Visibility="{Binding HasChildProperties, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                              </Border>
+
+                              <TextBlock Grid.Column="1" Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" TextTrimming="CharacterEllipsis" />
+                           </Grid>
+
+                           <Grid Grid.Column="1"
+                                 HorizontalAlignment="Right"
+                                 Margin="5,0,5,0"
+                                 Visibility="{Binding ShowAdvancedOptions, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PropertyGrid}, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                 utilities:ContextMenuUtilities.OpenOnMouseLeftButtonClick="True"
+                                 ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PropertyGrid}}">
+
+                              <Image x:Name="_optionsImage"
+                                     Width="11"
+                                     Height="11"
+                                     Source="{Binding ValueSource, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ValueSourceToImagePathConverter}}"
+                                     ToolTip="{Binding ValueSource, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ValueSourceToToolTipConverter}}" />
+                           </Grid>
+                        </Grid>
+                     </Border>
+
+                     <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Editor" Grid.Column="1" Background="Transparent">
+                        <ContentControl Content="{TemplateBinding Editor}" VerticalAlignment="Center" Focusable="False" IsTabStop="False" />
+                     </Border>
+
+                     <Expander x:Name="_propertyExpander" Grid.ColumnSpan="2" Grid.Row="1" IsExpanded="{TemplateBinding IsExpanded}" Style="{StaticResource PropertyExpanderStyle}" IsEnabled="True">
+                        <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False">
+                           <ItemsControl.ItemsPanel>
+                              <ItemsPanelTemplate>
+                                 <VirtualizingStackPanel />
+                              </ItemsPanelTemplate>
+                           </ItemsControl.ItemsPanel>
+                        </ItemsControl>
+                     </Expander>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <DataTrigger Binding="{Binding IsDataBound, RelativeSource={RelativeSource Self}}" Value="True">
+                     <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Database11.png" />
+                     <Setter TargetName="_optionsImage" Property="ToolTip" Value="Databinding" />
+                  </DataTrigger>
+                  <DataTrigger Binding="{Binding IsDynamicResource, RelativeSource={RelativeSource Self}}" Value="True">
+                     <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Resource11.png" />
+                     <Setter TargetName="_optionsImage" Property="ToolTip" Value="Resource" />
+                  </DataTrigger>
+                  <DataTrigger Binding="{Binding HasResourceApplied, RelativeSource={RelativeSource Self}}" Value="True">
+                     <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Resource11.png" />
+                     <Setter TargetName="_optionsImage" Property="ToolTip" Value="Resource" />
+                  </DataTrigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="PART_Name" Property="Background" Value="#CED4DF" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="PART_Name" Property="Background" Value="#43577B" />
+                     <Setter TargetName="PART_Name" Property="TextElement.Foreground" Value="White" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:PropertyGrid}">
+      <Setter Property="AdvancedOptionsMenu" Value="{StaticResource DefaultAdvancedOptionsMenu}" />
+      <Setter Property="Background" Value="#CED4DF" />
+      <Setter Property="BorderBrush" Value="#43577B" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:PropertyGrid}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition />
+                        <RowDefinition Height="5" />
+                        <RowDefinition Height="Auto"/>
+                     </Grid.RowDefinitions>
+
+                     <StackPanel Orientation="Horizontal" Margin="6,2,0,4">
+                        <TextBlock Text="{TemplateBinding SelectedObjectTypeName}" FontWeight="Bold" />
+                        <TextBlock Text="{TemplateBinding SelectedObjectName}" Margin="5,0,0,0" />
+                     </StackPanel>
+
+                     <Grid Grid.Row="1" Margin="4,0,4,4">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="Auto" />
+                           <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid Background="#BCC7D8" Margin="4" Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                           <StackPanel Orientation="Horizontal" Margin="1" >
+                              <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}}"
                                            VerticalAlignment="Center"
-                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                                </StackPanel>
-                            </Border>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
-                        </Trigger>
-
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" TargetName="Content" Value="0.5"/>
-                            <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E"/>
-                        </Trigger>
-
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder">
-                                <Setter.Value>
-                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                        <GradientStop Color="#FFE7CBAD" Offset="0"/>
-                                        <GradientStop Color="#FFF7D7B5" Offset="0.1"/>
-                                        <GradientStop Color="#FFFFD38C" Offset="0.36"/>
-                                        <GradientStop Color="#FFFFC75A" Offset="0.36"/>
-                                        <GradientStop Color="#FFFFEFA5" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent"/>
-                        </Trigger>
-
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsChecked" Value="True"/>
-                                <Condition Property="IsMouseOver" Value="True"/>
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Background" TargetName="MiddleBorder">
-                                <Setter.Value>
-                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                        <GradientStop Color="#40FFFEFE" Offset="0"/>
-                                        <GradientStop Color="#40FFFEFE" Offset="0.39"/>
-                                        <GradientStop Color="#20FFCE68" Offset="0.39"/>
-                                        <GradientStop Color="#20FFCE68" Offset="0.69"/>
-                                        <GradientStop Color="#10FFFFFF" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Setter.Value>
-                            </Setter>
-                        </MultiTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ClearFilterButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Height" Value="22" />
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="ToolTipService.InitialShowDelay" Value="900"/>
-        <Setter Property="ToolTipService.ShowDuration" Value="20000"/>
-        <Setter Property="ToolTipService.BetweenShowDelay" Value="0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid SnapsToDevicePixels="True">
-                        <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2"/>
-                        <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
-                            <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
-                                <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-                                    <ContentPresenter x:Name="Content" Content="{TemplateBinding Content}" Margin="1"
-                                           RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                           Style="{StaticResource OptionsToggleButtonStyle}"
+                                           ToolTip="Categorized">
+                                 <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/Categorize16.png" Width="16" Height="16" />
+                              </RadioButton>
+                              <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
                                            VerticalAlignment="Center"
-                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                                </StackPanel>
-                            </Border>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
-                        </Trigger>
-
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" TargetName="Content" Value="0.5"/>
-                            <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E"/>
-                        </Trigger>
-
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <SolidColorBrush x:Key="GlyphBrush" Color="#FF31347C"/>
-
-    <ControlTemplate x:Key="ExpanderToggleButton" TargetType="{x:Type ToggleButton}">
-        <Grid>
-            <Rectangle Margin="0,0,0,0" x:Name="Rectangle" Fill="Transparent" />
-            <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" RenderTransformOrigin="0.5,0.5">
-                <Path.RenderTransform>
-                    <TransformGroup>
-                        <ScaleTransform ScaleX="1" ScaleY="1" />
-                        <SkewTransform AngleX="0" AngleY="0" />
-                        <RotateTransform Angle="-90" />
-                        <TranslateTransform X="0" Y="0" />
-                    </TransformGroup>
-                </Path.RenderTransform>
-            </Path>
-            <Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" RenderTransformOrigin="0.5,0.5">
-                <Path.RenderTransform>
-                    <TransformGroup>
-                        <ScaleTransform ScaleX="1" ScaleY="1" />
-                        <SkewTransform AngleX="0" AngleY="0" />
-                        <RotateTransform Angle="135" />
-                        <TranslateTransform X="0" Y="0" />
-                    </TransformGroup>
-                </Path.RenderTransform>
-            </Path>
-        </Grid>
-        <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="true">
-                <Setter Property="Visibility" Value="Visible" TargetName="Down_Arrow" />
-                <Setter Property="Visibility" Value="Collapsed" TargetName="Up_Arrow" />
-                <Setter Property="OpacityMask" TargetName="Down_Arrow" Value="#FF000000" />
-            </Trigger>
-        </ControlTemplate.Triggers>
-    </ControlTemplate>
-
-    <Style x:Key="ExpanderStyle" TargetType="{x:Type Expander}">
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Background" Value="#FFF0F0F0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Expander}">
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" x:Name="ContentRow" />
-                        </Grid.RowDefinitions>
-                        <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="#FFF0F0F0">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="20" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <ToggleButton Template="{StaticResource ExpanderToggleButton}" IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True"  />
-                                <ContentPresenter Grid.Column="1" Margin="1" RecognizesAccessKey="True" ContentSource="Header" TextElement.FontWeight="Bold" />
-                            </Grid>
-                        </Border>
-                        <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Background="#FFF0F0F0" Padding="10 0 0 0">
-
-                            <Border Background="#FFFFFF" BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="false" />
-                            </Border>
+                                           Style="{StaticResource OptionsToggleButtonStyle}"
+                                           ToolTip="Alphabetical">
+                                 <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/SortAscending16.png" Width="16" Height="16" />
+                              </RadioButton>
+                           </StackPanel>
+                        </Grid>
 
+                        <Border Grid.Column="1" Margin="4,4,0,4" Background="White" BorderBrush="Gray" BorderThickness="1" Visibility="{Binding ShowSearchBox, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="Auto" />
+                              </Grid.ColumnDefinitions>
+                              <extToolkit:WatermarkTextBox x:Name="_txtFilter"
+                                                           Background="Transparent" 
+                                                           Text="{Binding Filter, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+                                                           Watermark="{TemplateBinding FilterWatermark}">
+                                 <extToolkit:WatermarkTextBox.Style>
+                                    <Style TargetType="Control">
+                                       <Setter Property="BorderThickness" Value="0" />
+                                       <Style.Triggers>
+                                          <Trigger Property="IsMouseOver" Value="True">
+                                             <Setter Property="BorderThickness" Value="1" />
+                                          </Trigger>
+                                       </Style.Triggers>
+                                    </Style>
+                                 </extToolkit:WatermarkTextBox.Style>
+
+                              </extToolkit:WatermarkTextBox>
+
+                              <Button Grid.Column="1"
+                                      Command="commands:PropertyGridCommands.ClearFilter"
+                                      Style="{StaticResource ClearFilterButtonStyle}"
+                                      HorizontalAlignment="Left">
+                                 <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/ClearFilter16.png" Width="16" Height="16" />
+                              </Button>
+                           </Grid>
                         </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsExpanded" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="PropertyExpanderStyle" TargetType="{x:Type Expander}">
-        <Setter Property="Padding" Value="10 0 0 0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Expander}">
-                    <Grid>
-                        <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Padding="0 0 0 0">
-                            <Border BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-												  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-												  Focusable="false" />
-                            </Border>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsExpanded" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <ContextMenu x:Key="DefaultAdvancedOptionsMenu">
-        <MenuItem Header="Reset Value" Command="commands:PropertyItemCommands.ResetValue" />
-    </ContextMenu>
-
-    <Style TargetType="{x:Type local:PropertyItem}">
-        <Setter Property="BorderBrush" Value="#FFF0F0F0" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Focusable" Value="True"/>
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:PropertyItem}">
-                    <Border Background="White" ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PropertyGrid}}" ContextMenuService.Placement="Bottom">
-                        <Grid VerticalAlignment="Center" HorizontalAlignment="Stretch">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PropertyGrid}}}"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-
-                            <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Name">
-                                <Grid Margin="2,2,2,2">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-
-                                    <Grid Margin="{Binding Level, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ExpandableObjectMarginConverter}}">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="15" />
-                                            <ColumnDefinition Width="*" />
-                                        </Grid.ColumnDefinitions>
-
-                                        <Border Grid.Column="0" >
-                                            <ToggleButton Template="{StaticResource ExpanderToggleButton}" OverridesDefaultStyle="True"
-                                              IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                              Visibility="{Binding HasChildProperties, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                                        </Border>
-
-                                        <TextBlock Grid.Column="1" Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" TextTrimming="CharacterEllipsis"/>
-                                    </Grid>                                    
-
-                                    <Grid Grid.Column="1" HorizontalAlignment="Right" Margin="5,0,5,0"  Visibility="{Binding ShowAdvancedOptions, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PropertyGrid}, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                          utilities:ContextMenuUtilities.OpenOnMouseLeftButtonClick="True"
-                                          ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PropertyGrid}}" >
-
-                                        <Image x:Name="_optionsImage" Width="11" Height="11"
-                                               Source="{Binding ValueSource, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ValueSourceToImagePathConverter}}"
-                                               ToolTip="{Binding ValueSource, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ValueSourceToToolTipConverter}}" />
-                                    </Grid>
-                                </Grid>
-                            </Border>
-
-                            <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Editor"  Grid.Column="1" Background="Transparent">
-                                <ContentControl Content="{TemplateBinding Editor}" VerticalAlignment="Center" Focusable="False" IsTabStop="False" />
-                            </Border>
-
-                            <Expander x:Name="_propertyExpander" Grid.ColumnSpan="2" Grid.Row="1" IsExpanded="{TemplateBinding IsExpanded}" Style="{StaticResource PropertyExpanderStyle}" IsEnabled="True">
-                                <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False" >
-                                    <ItemsControl.ItemsPanel>
-                                        <ItemsPanelTemplate>
-                                            <VirtualizingStackPanel />
-                                        </ItemsPanelTemplate>
-                                    </ItemsControl.ItemsPanel>
-                                </ItemsControl>
-                            </Expander>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding IsDataBound, RelativeSource={RelativeSource Self}}" Value="True">
-                            <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Database11.png" />
-                            <Setter TargetName="_optionsImage" Property="ToolTip" Value="Databinding" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding IsDynamicResource, RelativeSource={RelativeSource Self}}" Value="True">
-                            <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Resource11.png" />
-                            <Setter TargetName="_optionsImage" Property="ToolTip" Value="Resource" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding HasResourceApplied, RelativeSource={RelativeSource Self}}" Value="True">
-                            <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Resource11.png" />
-                            <Setter TargetName="_optionsImage" Property="ToolTip" Value="Resource" />
-                        </DataTrigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_Name" Property="Background" Value="#CED4DF" />
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="PART_Name" Property="Background" Value="#43577B" />
-                            <Setter TargetName="PART_Name" Property="TextElement.Foreground" Value="White" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type local:PropertyGrid}">
-        <Setter Property="AdvancedOptionsMenu" Value="{StaticResource DefaultAdvancedOptionsMenu}" />
-        <Setter Property="Background" Value="#CED4DF" />
-        <Setter Property="BorderBrush" Value="#43577B" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:PropertyGrid}">
-                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition />
-                                <RowDefinition Height="5" />
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-
-                            <StackPanel Orientation="Horizontal" Margin="6,2,0,4">
-                                <TextBlock Text="{TemplateBinding SelectedObjectTypeName}" FontWeight="Bold"/>
-                                <TextBlock Text="{TemplateBinding SelectedObjectName}" Margin="5,0,0,0" />
-                            </StackPanel>
-
-                            <Grid Grid.Row="1" Margin="4,0,4,4">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="*"/>
-                                </Grid.ColumnDefinitions>
-                                <Grid Background="#BCC7D8" Margin="4"  Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" >
-                                    <StackPanel Orientation="Horizontal" Margin="1" >
-                                        <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" 
-                                                     Style="{StaticResource OptionsToggleButtonStyle}" ToolTip="Categorized">
-                                            <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/Categorize16.png" Width="16" Height="16" />
-                                        </RadioButton>
-                                        <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}" VerticalAlignment="Center" 
-                                                     Style="{StaticResource OptionsToggleButtonStyle}" ToolTip="Alphabetical">
-                                            <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/SortAscending16.png" Width="16" Height="16"/>
-                                        </RadioButton>
-                                    </StackPanel>
-                                </Grid>
-
-                                <Border Grid.Column="1" Margin="4,4,0,4" Background="White" BorderBrush="Gray" BorderThickness="1" Visibility="{Binding ShowSearchBox, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"  >
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <extToolkit:WatermarkTextBox x:Name="_txtFilter" Background="Transparent" 
-                                                                 Text="{Binding Filter, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
-                                                                 Watermark="{TemplateBinding FilterWatermark}">
-                                            <extToolkit:WatermarkTextBox.Style>
-                                                <Style TargetType="Control">
-                                                    <Setter Property="BorderThickness" Value="0" />
-                                                    <Style.Triggers>
-                                                        <Trigger Property="IsMouseOver" Value="True">
-                                                            <Setter Property="BorderThickness" Value="1" />
-                                                        </Trigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </extToolkit:WatermarkTextBox.Style>
-
-                                        </extToolkit:WatermarkTextBox>
-
-                                        <Button Grid.Column="1" Command="commands:PropertyGridCommands.ClearFilter" Style="{StaticResource ClearFilterButtonStyle}"
-                                                HorizontalAlignment="Left">
-                                            <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/ClearFilter16.png" Width="16" Height="16"/>
-                                        </Button>
-                                    </Grid>
-                                </Border>
-                            </Grid>
-
-                            <Grid Grid.Row="2" Background="White">
-                                <ScrollViewer VerticalScrollBarVisibility="Auto">
-                                    <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False" >
-                                        <ItemsControl.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <VirtualizingStackPanel />
-                                            </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-
-                                        <ItemsControl.GroupStyle>
-                                            <GroupStyle>
-                                                <GroupStyle.ContainerStyle>
-                                                    <Style TargetType="{x:Type GroupItem}">
-                                                        <Setter Property="Template">
-                                                            <Setter.Value>
-                                                                <ControlTemplate>
-                                                                    <Border Background="{TemplateBinding Background}"
-                                                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                                                            BorderThickness="{TemplateBinding BorderThickness}">
-                                                                        <Expander Header="{Binding Name}" Style="{StaticResource ExpanderStyle}" IsExpanded="True">
-                                                                            <ItemsPresenter />
-                                                                        </Expander>
-                                                                    </Border>
-                                                                </ControlTemplate>
-                                                            </Setter.Value>
-                                                        </Setter>
-                                                    </Style>
-                                                </GroupStyle.ContainerStyle>
-                                            </GroupStyle>
-                                        </ItemsControl.GroupStyle>
-
-                                    </ItemsControl>
-                                </ScrollViewer>
-
-                                <Thumb x:Name="PART_DragThumb" HorizontalAlignment="Left" Width="5" Margin="6,0,0,0" Cursor="SizeWE">
-                                    <Thumb.RenderTransform>
-                                        <TranslateTransform X="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PropertyGrid}}}" />
-                                    </Thumb.RenderTransform>
-                                    <Thumb.Template>
-                                        <ControlTemplate>
-                                            <Border Background="Transparent" />
-                                        </ControlTemplate>
-                                    </Thumb.Template>
-                                </Thumb>
-
-                            </Grid>
-
-                            <GridSplitter Height="3" Grid.Row="3" HorizontalAlignment="Stretch" Visibility="{Binding DisplaySummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                            <StackPanel Grid.Row="4" Margin="0,0,0,5" Visibility="{Binding DisplaySummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                <TextBlock Padding="2 2 2 0" FontWeight="Bold" Text="{Binding SelectedProperty.DisplayName, RelativeSource={RelativeSource TemplatedParent}}" />
-                                <TextBlock Padding="5 2 2 0" TextWrapping="WrapWithOverflow" Text="{Binding SelectedProperty.Description, RelativeSource={RelativeSource TemplatedParent}}" />
-                            </StackPanel>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                     </Grid>
+
+                     <Grid Grid.Row="2" Background="White">
+                        <ScrollViewer VerticalScrollBarVisibility="Auto">
+                           <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False">
+                              <ItemsControl.ItemsPanel>
+                                 <ItemsPanelTemplate>
+                                    <VirtualizingStackPanel />
+                                 </ItemsPanelTemplate>
+                              </ItemsControl.ItemsPanel>
+
+                              <ItemsControl.GroupStyle>
+                                 <GroupStyle>
+                                    <GroupStyle.ContainerStyle>
+                                       <Style TargetType="{x:Type GroupItem}">
+                                          <Setter Property="Template">
+                                             <Setter.Value>
+                                                <ControlTemplate>
+                                                   <Border Background="{TemplateBinding Background}"
+                                                           BorderBrush="{TemplateBinding BorderBrush}"
+                                                           BorderThickness="{TemplateBinding BorderThickness}">
+                                                      <Expander Header="{Binding Name}" Style="{StaticResource ExpanderStyle}" IsExpanded="True">
+                                                         <ItemsPresenter />
+                                                      </Expander>
+                                                   </Border>
+                                                </ControlTemplate>
+                                             </Setter.Value>
+                                          </Setter>
+                                       </Style>
+                                    </GroupStyle.ContainerStyle>
+                                 </GroupStyle>
+                              </ItemsControl.GroupStyle>
+
+                           </ItemsControl>
+                        </ScrollViewer>
+
+                        <Thumb x:Name="PART_DragThumb" HorizontalAlignment="Left" Width="5" Margin="6,0,0,0" Cursor="SizeWE">
+                           <Thumb.RenderTransform>
+                              <TranslateTransform X="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PropertyGrid}}}" />
+                           </Thumb.RenderTransform>
+                           <Thumb.Template>
+                              <ControlTemplate>
+                                 <Border Background="Transparent" />
+                              </ControlTemplate>
+                           </Thumb.Template>
+                        </Thumb>
+
+                     </Grid>
+
+                     <GridSplitter Height="3" Grid.Row="3" HorizontalAlignment="Stretch" Visibility="{Binding DisplaySummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                     <StackPanel Grid.Row="4" Margin="0,0,0,5" Visibility="{Binding DisplaySummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <TextBlock Padding="2 2 2 0" FontWeight="Bold" Text="{Binding SelectedProperty.DisplayName, RelativeSource={RelativeSource TemplatedParent}}" />
+                        <TextBlock Padding="5 2 2 0" TextWrapping="WrapWithOverflow" Text="{Binding SelectedProperty.Description, RelativeSource={RelativeSource TemplatedParent}}" />
+                     </StackPanel>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs
index f8e22d41..228980a1 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/ITextFormatter.cs
@@ -1,11 +1,28 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Documents;
 
 namespace Microsoft.Windows.Controls
 {
-    public interface ITextFormatter
-    {
-        string GetText(FlowDocument document);
-        void SetText(FlowDocument document, string text);
-    }
+  public interface ITextFormatter
+  {
+    string GetText( FlowDocument document );
+    void SetText( FlowDocument document, string text );
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs
index 1c792a32..a5b54309 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/PlainTextFormatter.cs
@@ -1,21 +1,38 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Documents;
 
 namespace Microsoft.Windows.Controls
 {
-    /// <summary>
-    /// Formats the RichTextBox text as plain text
-    /// </summary>
-    public class PlainTextFormatter : ITextFormatter
+  /// <summary>
+  /// Formats the RichTextBox text as plain text
+  /// </summary>
+  public class PlainTextFormatter : ITextFormatter
+  {
+    public string GetText( FlowDocument document )
+    {
+      return new TextRange( document.ContentStart, document.ContentEnd ).Text;
+    }
+
+    public void SetText( FlowDocument document, string text )
     {
-        public string GetText(FlowDocument document)
-        {
-            return new TextRange(document.ContentStart, document.ContentEnd).Text;
-        }
-
-        public void SetText(FlowDocument document, string text)
-        {
-            new TextRange(document.ContentStart, document.ContentEnd).Text = text;
-        }
+      new TextRange( document.ContentStart, document.ContentEnd ).Text = text;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs
index 9b2b895c..dbb11683 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/RtfFormatter.cs
@@ -1,49 +1,67 @@
-using System;
-using System.Text;
-using System.Windows.Documents;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.IO;
+using System.Text;
 using System.Windows;
+using System.Windows.Documents;
 
 namespace Microsoft.Windows.Controls
 {
-    /// <summary>
-    /// Formats the RichTextBox text as RTF
-    /// </summary>
-    public class RtfFormatter : ITextFormatter
+  /// <summary>
+  /// Formats the RichTextBox text as RTF
+  /// </summary>
+  public class RtfFormatter : ITextFormatter
+  {
+    public string GetText( FlowDocument document )
     {
-        public string GetText(FlowDocument document)
+      TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
+      using( MemoryStream ms = new MemoryStream() )
+      {
+        tr.Save( ms, DataFormats.Rtf );
+        return ASCIIEncoding.Default.GetString( ms.ToArray() );
+      }
+    }
+
+    public void SetText( FlowDocument document, string text )
+    {
+      try
+      {
+        //if the text is null/empty clear the contents of the RTB. If you were to pass a null/empty string
+        //to the TextRange.Load method an exception would occur.
+        if( String.IsNullOrEmpty( text ) )
         {
-            TextRange tr = new TextRange(document.ContentStart, document.ContentEnd);
-            using (MemoryStream ms = new MemoryStream())
-            {
-                tr.Save(ms, DataFormats.Rtf);
-                return ASCIIEncoding.Default.GetString(ms.ToArray());
-            }
+          document.Blocks.Clear();
         }
-
-        public void SetText(FlowDocument document, string text)
+        else
         {
-            try
-            {
-                //if the text is null/empty clear the contents of the RTB. If you were to pass a null/empty string
-                //to the TextRange.Load method an exception would occur.
-                if (String.IsNullOrEmpty(text))
-                {
-                    document.Blocks.Clear();
-                }
-                else
-                {
-                    TextRange tr = new TextRange(document.ContentStart, document.ContentEnd);
-                    using (MemoryStream ms = new MemoryStream(Encoding.ASCII.GetBytes(text)))
-                    {
-                        tr.Load(ms, DataFormats.Rtf);
-                    }
-                }
-            }
-            catch
-            {
-                throw new InvalidDataException("Data provided is not in the correct RTF format.");
-            }
+          TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
+          using( MemoryStream ms = new MemoryStream( Encoding.ASCII.GetBytes( text ) ) )
+          {
+            tr.Load( ms, DataFormats.Rtf );
+          }
         }
+      }
+      catch
+      {
+        throw new InvalidDataException( "Data provided is not in the correct RTF format." );
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs
index 250f391b..f849f84d 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/Formatters/XamlFormatter.cs
@@ -1,49 +1,67 @@
-using System;
-using System.Text;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.IO;
-using System.Windows.Documents;
+using System.Text;
 using System.Windows;
+using System.Windows.Documents;
 
 namespace Microsoft.Windows.Controls
 {
-    /// <summary>
-    /// Formats the RichTextBox text as Xaml
-    /// </summary>
-    public class XamlFormatter : ITextFormatter
+  /// <summary>
+  /// Formats the RichTextBox text as Xaml
+  /// </summary>
+  public class XamlFormatter : ITextFormatter
+  {
+    public string GetText( System.Windows.Documents.FlowDocument document )
     {
-        public string GetText(System.Windows.Documents.FlowDocument document)
+      TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
+      using( MemoryStream ms = new MemoryStream() )
+      {
+        tr.Save( ms, DataFormats.Xaml );
+        return ASCIIEncoding.Default.GetString( ms.ToArray() );
+      }
+    }
+
+    public void SetText( System.Windows.Documents.FlowDocument document, string text )
+    {
+      try
+      {
+        //if the text is null/empty clear the contents of the RTB. If you were to pass a null/empty string
+        //to the TextRange.Load method an exception would occur.
+        if( String.IsNullOrEmpty( text ) )
         {
-            TextRange tr = new TextRange(document.ContentStart, document.ContentEnd);
-            using (MemoryStream ms = new MemoryStream())
-            {
-                tr.Save(ms, DataFormats.Xaml);
-                return ASCIIEncoding.Default.GetString(ms.ToArray());
-            }
+          document.Blocks.Clear();
         }
-
-        public void SetText(System.Windows.Documents.FlowDocument document, string text)
+        else
         {
-            try
-            {
-                //if the text is null/empty clear the contents of the RTB. If you were to pass a null/empty string
-                //to the TextRange.Load method an exception would occur.
-                if (String.IsNullOrEmpty(text))
-                {
-                    document.Blocks.Clear();
-                }
-                else
-                {
-                    TextRange tr = new TextRange(document.ContentStart, document.ContentEnd);
-                    using (MemoryStream ms = new MemoryStream(Encoding.ASCII.GetBytes(text)))
-                    {
-                        tr.Load(ms, DataFormats.Xaml);
-                    }
-                }
-            }
-            catch
-            {
-                throw new InvalidDataException("Data provided is not in the correct Xaml format.");
-            }
+          TextRange tr = new TextRange( document.ContentStart, document.ContentEnd );
+          using( MemoryStream ms = new MemoryStream( Encoding.ASCII.GetBytes( text ) ) )
+          {
+            tr.Load( ms, DataFormats.Xaml );
+          }
         }
+      }
+      catch
+      {
+        throw new InvalidDataException( "Data provided is not in the correct Xaml format." );
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs
index 20a9a9ec..0303c22e 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBox/RichTextBox.cs
@@ -1,145 +1,169 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 using System.Windows.Data;
 using System.Windows.Threading;
 
 namespace Microsoft.Windows.Controls
 {
-    public class RichTextBox : System.Windows.Controls.RichTextBox
-    {
-        #region Private Members
+  public class RichTextBox : System.Windows.Controls.RichTextBox
+  {
+    #region Private Members
 
-        private bool _textSetInternally;
-        bool _surpressGetText;
+    private bool _textSetInternally;
+    bool _surpressGetText;
 
-        #endregion //Private Members
+    #endregion //Private Members
 
-        #region Constructors
+    #region Constructors
 
-        public RichTextBox()
-        {
-            Loaded += RichTextBox_Loaded;
-        }
-
-        public RichTextBox(System.Windows.Documents.FlowDocument document)
-            : base(document)
-        {
+    public RichTextBox()
+    {
+      Loaded += RichTextBox_Loaded;
+    }
 
-        }
+    public RichTextBox( System.Windows.Documents.FlowDocument document )
+      : base( document )
+    {
 
-        #endregion //Constructors
+    }
 
-        #region Properties
+    #endregion //Constructors
 
-        #region Text
+    #region Properties
 
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(RichTextBox), new FrameworkPropertyMetadata(String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextPropertyChanged, CoerceTextProperty, true, UpdateSourceTrigger.LostFocus));
-        public string Text
-        {
-            get { return (string)GetValue(TextProperty); }
-            set { SetValue(TextProperty, value); }
-        }
+    #region Text
 
-        private static void OnTextPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            RichTextBox rtb = (RichTextBox)d;
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( RichTextBox ), new FrameworkPropertyMetadata( String.Empty, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnTextPropertyChanged, CoerceTextProperty, true, UpdateSourceTrigger.LostFocus ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
 
-            // if the text is not being set internally then load the text into the RichTextBox
-            if (!rtb._textSetInternally)
+    private static void OnTextPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RichTextBox rtb = ( RichTextBox )d;
+
+      // if the text is not being set internally then load the text into the RichTextBox
+      if( !rtb._textSetInternally )
+      {
+        //to help with performance this is placed on the dispatcher for processing. For some reason when this is done the TextChanged event is fired multiple times
+        //forcing the UpdateText method to be called multiple times and the setter of the source property to be set multiple times. To fix this, we simply set the _surpressGetText
+        //member to true before the operation and set it to false when the operation completes. This will prevent the Text property from being set multiple times.
+        rtb._surpressGetText = true;
+        DispatcherOperation dop = Dispatcher.CurrentDispatcher.BeginInvoke( new Action( delegate()
             {
-                //to help with performance this is placed on the dispatcher for processing. For some reason when this is done the TextChanged event is fired multiple times
-                //forcing the UpdateText method to be called multiple times and the setter of the source property to be set multiple times. To fix this, we simply set the _surpressGetText
-                //member to true before the operation and set it to false when the operation completes. This will prevent the Text property from being set multiple times.
-                rtb._surpressGetText = true;
-                DispatcherOperation dop = Dispatcher.CurrentDispatcher.BeginInvoke(new Action(delegate()
-                    {
-                        rtb.TextFormatter.SetText(rtb.Document, (string)e.NewValue);
-                    }), DispatcherPriority.Background);
-                dop.Completed += (sender, ea) =>
-                    {
-                        rtb._surpressGetText = false;
-                    };
-            }
-        }
+              rtb.TextFormatter.SetText( rtb.Document, ( string )e.NewValue );
+            } ), DispatcherPriority.Background );
+        dop.Completed += ( sender, ea ) =>
+            {
+              rtb._surpressGetText = false;
+            };
+      }
+    }
 
-        private static object CoerceTextProperty(DependencyObject d, object value)
-        {
-            return value ?? "";
-        }
+    private static object CoerceTextProperty( DependencyObject d, object value )
+    {
+      return value ?? "";
+    }
 
-        #endregion //Text
+    #endregion //Text
 
-        #region TextFormatter
+    #region TextFormatter
 
-        private ITextFormatter _textFormatter;
-        /// <summary>
-        /// The ITextFormatter the is used to format the text of the RichTextBox.
-        /// Deafult formatter is the RtfFormatter
-        /// </summary>
-        public ITextFormatter TextFormatter
+    private ITextFormatter _textFormatter;
+    /// <summary>
+    /// The ITextFormatter the is used to format the text of the RichTextBox.
+    /// Deafult formatter is the RtfFormatter
+    /// </summary>
+    public ITextFormatter TextFormatter
+    {
+      get
+      {
+        if( _textFormatter == null )
+          _textFormatter = new RtfFormatter(); //default is rtf
+
+        return _textFormatter;
+      }
+      set
+      {
+        if( _textFormatter != value )
         {
-            get
-            {
-                if (_textFormatter == null)
-                    _textFormatter = new RtfFormatter(); //default is rtf
-
-                return _textFormatter;
-            }
-            set
-            {
-                if (_textFormatter != value)
-                {
-                    _textFormatter = value;
-                    _textFormatter.SetText(Document, Text);
-                }
-            }
+          _textFormatter = value;
+          _textFormatter.SetText( Document, Text );
         }
+      }
+    }
 
-        #endregion //TextFormatter
+    #endregion //TextFormatter
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region Methods
+    #region Methods
 
-        private void UpdateText()
-        {
-            _textSetInternally = true;
+    private void UpdateText()
+    {
+      _textSetInternally = true;
 
-            if (!_surpressGetText)
-                Text = TextFormatter.GetText(Document);
+      if( !_surpressGetText )
+        Text = TextFormatter.GetText( Document );
 
-            _textSetInternally = false;
-        }
+      _textSetInternally = false;
+    }
 
-        /// <summary>
-        /// Clears the content of the RichTextBox.
-        /// </summary>
-        public void Clear()
-        {
-            Document.Blocks.Clear();
-        }
+    /// <summary>
+    /// Clears the content of the RichTextBox.
+    /// </summary>
+    public void Clear()
+    {
+      Document.Blocks.Clear();
+    }
 
-        #endregion //Methods
+    #endregion //Methods
 
-        #region Event Hanlders
+    #region Event Hanlders
 
-        private void RichTextBox_Loaded(object sender, RoutedEventArgs e)
-        {
-            Binding binding = BindingOperations.GetBinding(this, TextProperty);
+    private void RichTextBox_Loaded( object sender, RoutedEventArgs e )
+    {
+      Binding binding = BindingOperations.GetBinding( this, TextProperty );
 
-            if (binding != null)
-            {
-                if (binding.UpdateSourceTrigger == UpdateSourceTrigger.Default || binding.UpdateSourceTrigger == UpdateSourceTrigger.LostFocus)
-                {
-                    PreviewLostKeyboardFocus += (o, ea) => UpdateText();
-                }
-                else
-                {
-                    TextChanged += (o, ea) => UpdateText();
-                }
-            }
+      if( binding != null )
+      {
+        if( binding.UpdateSourceTrigger == UpdateSourceTrigger.Default || binding.UpdateSourceTrigger == UpdateSourceTrigger.LostFocus )
+        {
+          PreviewLostKeyboardFocus += ( o, ea ) => UpdateText();
         }
-
-        #endregion //Event Hanlders
+        else
+        {
+          TextChanged += ( o, ea ) => UpdateText();
+        }
+      }
     }
+
+    #endregion //Event Hanlders
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
index 46c38afe..0b6bc3d7 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/IRichTextBoxFormatBar.cs
@@ -1,12 +1,33 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls
 {
-    public interface IRichTextBoxFormatBar
+  public interface IRichTextBoxFormatBar
+  {
+    /// <summary>
+    /// Represents the RichTextBox that will be the target for all text manipulations in the format bar.
+    /// </summary>
+    global::System.Windows.Controls.RichTextBox Target
     {
-        /// <summary>
-        /// Represents the RichTextBox that will be the target for all text manipulations in the format bar.
-        /// </summary>
-        global::System.Windows.Controls.RichTextBox Target { get; set; }
+      get;
+      set;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
index ae4b1845..d2fa1ad2 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml
@@ -1,4 +1,22 @@
-<UserControl x:Class="Microsoft.Windows.Controls.RichTextBoxFormatBar"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<UserControl x:Class="Microsoft.Windows.Controls.RichTextBoxFormatBar"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:extToolkit="clr-namespace:Microsoft.Windows.Controls"
@@ -6,422 +24,454 @@
              Background="Transparent"
              IsTabStop="False"
              x:Name="_window">
-    <UserControl.Effect>
-        <DropShadowEffect BlurRadius="5" Opacity=".25" />
-    </UserControl.Effect>
-
-    <UserControl.Resources>
-
-        <coreConverters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-
-        <Style TargetType="{x:Type Separator}" BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}"/>
-
-        <ControlTemplate x:Key="ThumbControlTemplate" TargetType="{x:Type Thumb}">
-            <Border Background="Transparent" Cursor="Hand" ToolTip="Click to Drag">
-                <StackPanel VerticalAlignment="Center" Width="75">
-                    <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5" >
-                        <Line.Stroke>
-                            <SolidColorBrush Color="Gray" />
-                        </Line.Stroke>
-                    </Line>
-                    <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5">
-                        <Line.Stroke>
-                            <SolidColorBrush Color="Gray" />
-                        </Line.Stroke>
-                    </Line>
-                    <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5">
-                        <Line.Stroke>
-                            <SolidColorBrush Color="Gray" />
-                        </Line.Stroke>
-                    </Line>
-                </StackPanel>
-            </Border>
-        </ControlTemplate>
-
-        <SolidColorBrush x:Key="MouseOverBorderBrush" Color="#FFFFB700" />
-        <LinearGradientBrush x:Key="MouseOverBackgroundBrush" StartPoint="0,0" EndPoint="0,1" >
-            <GradientStop Offset="0" Color="#FFFEFBF4" />
-            <GradientStop Offset="0.19" Color="#FFFDE7CE" />
-            <GradientStop Offset="0.39" Color="#FFFDDEB8" />
-            <GradientStop Offset="0.39" Color="#FFFFCE6B" />
-            <GradientStop Offset="0.79" Color="#FFFFDE9A" />
-            <GradientStop Offset="1" Color="#FFFFEBAA" />
-        </LinearGradientBrush>
-
-        <SolidColorBrush x:Key="CheckedBorderBrush" Color="#FFC29B29" />
-        <LinearGradientBrush x:Key="CheckedBackgroundBrush" StartPoint="0,0" EndPoint="0,1" >
-            <GradientStop Offset="0" Color="#FFFFDCA0" />
-            <GradientStop Offset="0.18" Color="#FFFFD692" />
-            <GradientStop Offset="0.39" Color="#FFFFC45D" />
-            <GradientStop Offset="1" Color="#FFFFD178" />
-        </LinearGradientBrush>
-
-        <SolidColorBrush x:Key="PressedBorderBrush" Color="#FFC29B29" />
-        <LinearGradientBrush x:Key="PressedBackgroundBrush" StartPoint="0,0" EndPoint="0,1" >
-            <GradientStop Offset="0" Color="#FFE3C085" />
-            <GradientStop Offset="0.19" Color="#FFF4CC89" />
-            <GradientStop Offset="0.36" Color="#FFF5C777" />
-            <GradientStop Offset="0.36" Color="#FFF5BB56" />
-            <GradientStop Offset="0.79" Color="#FFF4CE9A" />
-            <GradientStop Offset="1" Color="#FFF3E28D" />
-        </LinearGradientBrush>
-
-        <Style x:Key="FormatBarToggleButtonStyle" TargetType="{x:Type ToggleButton}">
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-            <Setter Property="Height" Value="22" />
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="ToolTipService.InitialShowDelay" Value="900"/>
-            <Setter Property="ToolTipService.ShowDuration" Value="20000"/>
-            <Setter Property="ToolTipService.BetweenShowDelay" Value="0"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type ToggleButton}">
-                        <Grid SnapsToDevicePixels="True">
-                            <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2"/>
-                            <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
-                                <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
-                                    <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-                                        <ContentPresenter x:Name="Content" Content="{TemplateBinding Content}" Margin="1"
-                                           RenderOptions.BitmapScalingMode="NearestNeighbor"
-                                           VerticalAlignment="Center"
-                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                                    </StackPanel>
-                                </Border>
-                            </Border>
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
-                            </Trigger>
-
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="Opacity" TargetName="Content" Value="0.5"/>
-                                <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E"/>
-                            </Trigger>
-
-                            <Trigger Property="IsChecked" Value="True">
-                                <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="InnerBorder">
-                                    <Setter.Value>
-                                        <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                            <GradientStop Color="#FFE7CBAD" Offset="0"/>
-                                            <GradientStop Color="#FFF7D7B5" Offset="0.1"/>
-                                            <GradientStop Color="#FFFFD38C" Offset="0.36"/>
-                                            <GradientStop Color="#FFFFC75A" Offset="0.36"/>
-                                            <GradientStop Color="#FFFFEFA5" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Setter.Value>
-                                </Setter>
-                            </Trigger>
-
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent"/>
-                            </Trigger>
-
-                            <MultiTrigger>
-                                <MultiTrigger.Conditions>
-                                    <Condition Property="IsChecked" Value="True"/>
-                                    <Condition Property="IsMouseOver" Value="True"/>
-                                </MultiTrigger.Conditions>
-                                <Setter Property="Background" TargetName="MiddleBorder">
-                                    <Setter.Value>
-                                        <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                            <GradientStop Color="#40FFFEFE" Offset="0"/>
-                                            <GradientStop Color="#40FFFEFE" Offset="0.39"/>
-                                            <GradientStop Color="#20FFCE68" Offset="0.39"/>
-                                            <GradientStop Color="#20FFCE68" Offset="0.69"/>
-                                            <GradientStop Color="#10FFFFFF" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Setter.Value>
-                                </Setter>
-                            </MultiTrigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style x:Key="FontColorButtonStyle" TargetType="{x:Type ToggleButton}">
-            <Setter Property="Background" Value="Transparent"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-            <Setter Property="Height" Value="22" />
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="ToolTipService.InitialShowDelay" Value="900"/>
-            <Setter Property="ToolTipService.ShowDuration" Value="20000"/>
-            <Setter Property="ToolTipService.BetweenShowDelay" Value="0"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type ToggleButton}">
-                        <Grid SnapsToDevicePixels="True">
-                            <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
-                            <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
-                                <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition />
-                                        </Grid.ColumnDefinitions>
-
-                                        <Grid>
-                                            <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/FontColorPicker16.png" Width="16" Height="16" />
-                                            <Rectangle Grid.Row="1" Height="4" Margin="0,12,0,0"
-                                                       Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=extToolkit:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                                        </Grid>
-
-                                        <Path Grid.Column="1" Width="7" Height="4" 
-                                              Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                    </Grid>
-                                </Border>
-                            </Border>
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
-                            </Trigger>
-
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E"/>
-                            </Trigger>
-
-                            <Trigger Property="IsChecked" Value="True">
-                                <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="InnerBorder">
-                                    <Setter.Value>
-                                        <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                            <GradientStop Color="#FFE7CBAD" Offset="0"/>
-                                            <GradientStop Color="#FFF7D7B5" Offset="0.1"/>
-                                            <GradientStop Color="#FFFFD38C" Offset="0.36"/>
-                                            <GradientStop Color="#FFFFC75A" Offset="0.36"/>
-                                            <GradientStop Color="#FFFFEFA5" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Setter.Value>
-                                </Setter>
-                            </Trigger>
-
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent"/>
-                            </Trigger>
-
-                            <MultiTrigger>
-                                <MultiTrigger.Conditions>
-                                    <Condition Property="IsChecked" Value="True"/>
-                                    <Condition Property="IsMouseOver" Value="True"/>
-                                </MultiTrigger.Conditions>
-                                <Setter Property="Background" TargetName="MiddleBorder">
-                                    <Setter.Value>
-                                        <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                            <GradientStop Color="#40FFFEFE" Offset="0"/>
-                                            <GradientStop Color="#40FFFEFE" Offset="0.39"/>
-                                            <GradientStop Color="#20FFCE68" Offset="0.39"/>
-                                            <GradientStop Color="#20FFCE68" Offset="0.69"/>
-                                            <GradientStop Color="#10FFFFFF" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Setter.Value>
-                                </Setter>
-                            </MultiTrigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-        <Style x:Key="FontBackgrounColorButtonStyle" TargetType="{x:Type ToggleButton}">
-            <Setter Property="Background" Value="White"/>
-            <Setter Property="BorderBrush" Value="Transparent"/>
-            <Setter Property="BorderThickness" Value="1"/>
-            <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-            <Setter Property="Height" Value="22" />
-            <Setter Property="HorizontalContentAlignment" Value="Center"/>
-            <Setter Property="ToolTipService.InitialShowDelay" Value="900"/>
-            <Setter Property="ToolTipService.ShowDuration" Value="20000"/>
-            <Setter Property="ToolTipService.BetweenShowDelay" Value="0"/>
-            <Setter Property="Template">
-                <Setter.Value>
-                    <ControlTemplate TargetType="{x:Type ToggleButton}">
-                        <Grid SnapsToDevicePixels="True">
-                            <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2"/>
-                            <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
-                                <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*"/>
-                                            <ColumnDefinition />
-                                        </Grid.ColumnDefinitions>
-
-                                        <Grid>
-                                            <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png" Width="16" Height="16" />
-                                            <Rectangle Grid.Row="1" Height="4" Margin="0,12,0,0"
-                                                       Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=extToolkit:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                                        </Grid>
-
-                                        <Path Grid.Column="1" Width="7" Height="4" 
-                                              Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                    </Grid>
-                                </Border>
-                            </Border>
-                        </Grid>
-                        <ControlTemplate.Triggers>
-                            <Trigger Property="IsMouseOver" Value="True">
-                                <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
-                            </Trigger>
-
-                            <Trigger Property="IsEnabled" Value="False">
-                                <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E"/>
-                            </Trigger>
-
-                            <Trigger Property="IsChecked" Value="True">
-                                <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="InnerBorder">
-                                    <Setter.Value>
-                                        <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                            <GradientStop Color="#FFE7CBAD" Offset="0"/>
-                                            <GradientStop Color="#FFF7D7B5" Offset="0.1"/>
-                                            <GradientStop Color="#FFFFD38C" Offset="0.36"/>
-                                            <GradientStop Color="#FFFFC75A" Offset="0.36"/>
-                                            <GradientStop Color="#FFFFEFA5" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Setter.Value>
-                                </Setter>
-                            </Trigger>
-
-                            <Trigger Property="IsPressed" Value="True">
-                                <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}"/>
-                                <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent"/>
-                            </Trigger>
-
-                            <MultiTrigger>
-                                <MultiTrigger.Conditions>
-                                    <Condition Property="IsChecked" Value="True"/>
-                                    <Condition Property="IsMouseOver" Value="True"/>
-                                </MultiTrigger.Conditions>
-                                <Setter Property="Background" TargetName="MiddleBorder">
-                                    <Setter.Value>
-                                        <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                            <GradientStop Color="#40FFFEFE" Offset="0"/>
-                                            <GradientStop Color="#40FFFEFE" Offset="0.39"/>
-                                            <GradientStop Color="#20FFCE68" Offset="0.39"/>
-                                            <GradientStop Color="#20FFCE68" Offset="0.69"/>
-                                            <GradientStop Color="#10FFFFFF" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Setter.Value>
-                                </Setter>
-                            </MultiTrigger>
-                        </ControlTemplate.Triggers>
-                    </ControlTemplate>
-                </Setter.Value>
-            </Setter>
-        </Style>
-
-    </UserControl.Resources>
-
-    <Border CornerRadius="3" BorderThickness="1" BorderBrush="Gray" Background="WhiteSmoke">
-        <Grid Margin="5,0,5,5">
-            <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-
-            <Thumb x:Name="_dragWidget" Height="10" 
+   <UserControl.Effect>
+      <DropShadowEffect BlurRadius="5" Opacity=".25" />
+   </UserControl.Effect>
+
+   <UserControl.Resources>
+
+      <coreConverters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+      <Style TargetType="{x:Type Separator}" BasedOn="{StaticResource {x:Static ToolBar.SeparatorStyleKey}}" />
+
+      <ControlTemplate x:Key="ThumbControlTemplate" TargetType="{x:Type Thumb}">
+         <Border Background="Transparent" Cursor="Hand" ToolTip="Click to Drag">
+            <StackPanel VerticalAlignment="Center" Width="75">
+               <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5">
+                  <Line.Stroke>
+                     <SolidColorBrush Color="Gray" />
+                  </Line.Stroke>
+               </Line>
+               <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5">
+                  <Line.Stroke>
+                     <SolidColorBrush Color="Gray" />
+                  </Line.Stroke>
+               </Line>
+               <Line SnapsToDevicePixels="True" Stretch="Fill" StrokeDashArray="1,2" StrokeThickness="1" X1="0" X2="1" Margin=".5">
+                  <Line.Stroke>
+                     <SolidColorBrush Color="Gray" />
+                  </Line.Stroke>
+               </Line>
+            </StackPanel>
+         </Border>
+      </ControlTemplate>
+
+      <SolidColorBrush x:Key="MouseOverBorderBrush" Color="#FFFFB700" />
+      <LinearGradientBrush x:Key="MouseOverBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+         <GradientStop Offset="0" Color="#FFFEFBF4" />
+         <GradientStop Offset="0.19" Color="#FFFDE7CE" />
+         <GradientStop Offset="0.39" Color="#FFFDDEB8" />
+         <GradientStop Offset="0.39" Color="#FFFFCE6B" />
+         <GradientStop Offset="0.79" Color="#FFFFDE9A" />
+         <GradientStop Offset="1" Color="#FFFFEBAA" />
+      </LinearGradientBrush>
+
+      <SolidColorBrush x:Key="CheckedBorderBrush" Color="#FFC29B29" />
+      <LinearGradientBrush x:Key="CheckedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+         <GradientStop Offset="0" Color="#FFFFDCA0" />
+         <GradientStop Offset="0.18" Color="#FFFFD692" />
+         <GradientStop Offset="0.39" Color="#FFFFC45D" />
+         <GradientStop Offset="1" Color="#FFFFD178" />
+      </LinearGradientBrush>
+
+      <SolidColorBrush x:Key="PressedBorderBrush" Color="#FFC29B29" />
+      <LinearGradientBrush x:Key="PressedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+         <GradientStop Offset="0" Color="#FFE3C085" />
+         <GradientStop Offset="0.19" Color="#FFF4CC89" />
+         <GradientStop Offset="0.36" Color="#FFF5C777" />
+         <GradientStop Offset="0.36" Color="#FFF5BB56" />
+         <GradientStop Offset="0.79" Color="#FFF4CE9A" />
+         <GradientStop Offset="1" Color="#FFF3E28D" />
+      </LinearGradientBrush>
+
+      <Style x:Key="FormatBarToggleButtonStyle" TargetType="{x:Type ToggleButton}">
+         <Setter Property="Background" Value="Transparent" />
+         <Setter Property="BorderBrush" Value="Transparent" />
+         <Setter Property="BorderThickness" Value="1" />
+         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+         <Setter Property="Height" Value="22" />
+         <Setter Property="HorizontalContentAlignment" Value="Center" />
+         <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+         <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+         <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="{x:Type ToggleButton}">
+                  <Grid SnapsToDevicePixels="True">
+                     <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2" />
+                     <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                        <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                           <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                              <ContentPresenter x:Name="Content"
+                                                Content="{TemplateBinding Content}"
+                                                Margin="1"
+                                                RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                                VerticalAlignment="Center"
+                                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                           </StackPanel>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <ControlTemplate.Triggers>
+                     <Trigger Property="IsMouseOver" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                     </Trigger>
+
+                     <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                        <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                     </Trigger>
+
+                     <Trigger Property="IsChecked" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#FFE7CBAD" Offset="0" />
+                                 <GradientStop Color="#FFF7D7B5" Offset="0.1" />
+                                 <GradientStop Color="#FFFFD38C" Offset="0.36" />
+                                 <GradientStop Color="#FFFFC75A" Offset="0.36" />
+                                 <GradientStop Color="#FFFFEFA5" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </Trigger>
+
+                     <Trigger Property="IsPressed" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                     </Trigger>
+
+                     <MultiTrigger>
+                        <MultiTrigger.Conditions>
+                           <Condition Property="IsChecked" Value="True" />
+                           <Condition Property="IsMouseOver" Value="True" />
+                        </MultiTrigger.Conditions>
+                        <Setter Property="Background" TargetName="MiddleBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#40FFFEFE" Offset="0" />
+                                 <GradientStop Color="#40FFFEFE" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.69" />
+                                 <GradientStop Color="#10FFFFFF" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </MultiTrigger>
+                  </ControlTemplate.Triggers>
+               </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+
+      <Style x:Key="FontColorButtonStyle" TargetType="{x:Type ToggleButton}">
+         <Setter Property="Background" Value="Transparent" />
+         <Setter Property="BorderBrush" Value="Transparent" />
+         <Setter Property="BorderThickness" Value="1" />
+         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+         <Setter Property="Height" Value="22" />
+         <Setter Property="HorizontalContentAlignment" Value="Center" />
+         <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+         <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+         <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="{x:Type ToggleButton}">
+                  <Grid SnapsToDevicePixels="True">
+                     <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2" />
+                     <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                        <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition />
+                              </Grid.ColumnDefinitions>
+
+                              <Grid>
+                                 <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/FontColorPicker16.png" Width="16" Height="16" />
+                                 <Rectangle Grid.Row="1"
+                                            Height="4"
+                                            Margin="0,12,0,0"
+                                            Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=extToolkit:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              </Grid>
+
+                              <Path Grid.Column="1"
+                                    Width="7"
+                                    Height="4" 
+                                    Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                           </Grid>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <ControlTemplate.Triggers>
+                     <Trigger Property="IsMouseOver" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                     </Trigger>
+
+                     <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                     </Trigger>
+
+                     <Trigger Property="IsChecked" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#FFE7CBAD" Offset="0" />
+                                 <GradientStop Color="#FFF7D7B5" Offset="0.1" />
+                                 <GradientStop Color="#FFFFD38C" Offset="0.36" />
+                                 <GradientStop Color="#FFFFC75A" Offset="0.36" />
+                                 <GradientStop Color="#FFFFEFA5" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </Trigger>
+
+                     <Trigger Property="IsPressed" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                     </Trigger>
+
+                     <MultiTrigger>
+                        <MultiTrigger.Conditions>
+                           <Condition Property="IsChecked" Value="True" />
+                           <Condition Property="IsMouseOver" Value="True" />
+                        </MultiTrigger.Conditions>
+                        <Setter Property="Background" TargetName="MiddleBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#40FFFEFE" Offset="0" />
+                                 <GradientStop Color="#40FFFEFE" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.69" />
+                                 <GradientStop Color="#10FFFFFF" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </MultiTrigger>
+                  </ControlTemplate.Triggers>
+               </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+
+      <Style x:Key="FontBackgrounColorButtonStyle" TargetType="{x:Type ToggleButton}">
+         <Setter Property="Background" Value="White" />
+         <Setter Property="BorderBrush" Value="Transparent" />
+         <Setter Property="BorderThickness" Value="1" />
+         <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+         <Setter Property="Height" Value="22" />
+         <Setter Property="HorizontalContentAlignment" Value="Center" />
+         <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+         <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+         <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+         <Setter Property="Template">
+            <Setter.Value>
+               <ControlTemplate TargetType="{x:Type ToggleButton}">
+                  <Grid SnapsToDevicePixels="True">
+                     <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="2" />
+                     <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                        <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition />
+                              </Grid.ColumnDefinitions>
+
+                              <Grid>
+                                 <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/TextHighlightColorPicker16.png" Width="16" Height="16" />
+                                 <Rectangle Grid.Row="1"
+                                            Height="4"
+                                            Margin="0,12,0,0"
+                                            Fill="{Binding SelectedColor, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=extToolkit:ColorPicker}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              </Grid>
+
+                              <Path Grid.Column="1"
+                                    Width="7"
+                                    Height="4" 
+                                    Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                           </Grid>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <ControlTemplate.Triggers>
+                     <Trigger Property="IsMouseOver" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                     </Trigger>
+
+                     <Trigger Property="IsEnabled" Value="False">
+                        <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                     </Trigger>
+
+                     <Trigger Property="IsChecked" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#FFE7CBAD" Offset="0" />
+                                 <GradientStop Color="#FFF7D7B5" Offset="0.1" />
+                                 <GradientStop Color="#FFFFD38C" Offset="0.36" />
+                                 <GradientStop Color="#FFFFC75A" Offset="0.36" />
+                                 <GradientStop Color="#FFFFEFA5" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </Trigger>
+
+                     <Trigger Property="IsPressed" Value="True">
+                        <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                        <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                        <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                     </Trigger>
+
+                     <MultiTrigger>
+                        <MultiTrigger.Conditions>
+                           <Condition Property="IsChecked" Value="True" />
+                           <Condition Property="IsMouseOver" Value="True" />
+                        </MultiTrigger.Conditions>
+                        <Setter Property="Background" TargetName="MiddleBorder">
+                           <Setter.Value>
+                              <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                                 <GradientStop Color="#40FFFEFE" Offset="0" />
+                                 <GradientStop Color="#40FFFEFE" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.39" />
+                                 <GradientStop Color="#20FFCE68" Offset="0.69" />
+                                 <GradientStop Color="#10FFFFFF" Offset="1" />
+                              </LinearGradientBrush>
+                           </Setter.Value>
+                        </Setter>
+                     </MultiTrigger>
+                  </ControlTemplate.Triggers>
+               </ControlTemplate>
+            </Setter.Value>
+         </Setter>
+      </Style>
+
+   </UserControl.Resources>
+
+   <Border CornerRadius="3" BorderThickness="1" BorderBrush="Gray" Background="WhiteSmoke">
+      <Grid Margin="5,0,5,5">
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+         </Grid.RowDefinitions>
+
+         <Thumb x:Name="_dragWidget" Height="10" 
                    Template="{StaticResource ThumbControlTemplate}"
-                   DragDelta="DragWidget_DragDelta"/>
-
-            <StackPanel Grid.Row="1">
-                <StackPanel Orientation="Horizontal">
-                    <ComboBox x:Name="_cmbFontFamilies" IsEditable="True" Width="100"
-                              SelectionChanged="FontFamily_SelectionChanged"
-                              ToolTip="Font Family"/>
-
-                    <ComboBox x:Name="_cmbFontSizes" IsEditable="True" Width="43"
-                              SelectionChanged="FontSize_SelectionChanged"
-                              ToolTip="Font Size"/>
-
-                    <Separator />
-
-                    <ToggleButton x:Name="_btnBullets" Style="{StaticResource FormatBarToggleButtonStyle}"
-                                  Command="EditingCommands.ToggleBullets" CommandTarget="{Binding ElementName=_window, Path=Target}"
-                                  Click="Bullets_Clicked"
-                                  ToolTip="Bullets">
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Bullets16.png" />
-                    </ToggleButton>
-
-                    <ToggleButton x:Name="_btnNumbers" Style="{StaticResource FormatBarToggleButtonStyle}"
-                                  Command="EditingCommands.ToggleNumbering" CommandTarget="{Binding ElementName=_window, Path=Target}"
-                                  Click="Numbers_Clicked"
-                                  ToolTip="Numbering">
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Numbering16.png" />
-                    </ToggleButton>
-
-                </StackPanel>
-
-                <StackPanel Orientation="Horizontal" Margin="0,3,0,0">
-                    <ToggleButton x:Name="_btnBold" Style="{StaticResource FormatBarToggleButtonStyle}"
-                                Command="EditingCommands.ToggleBold" CommandTarget="{Binding ElementName=_window, Path=Target}"
-                                  ToolTip="Bold">
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Bold16.png" />
-                    </ToggleButton>
-                    <ToggleButton x:Name="_btnItalic" Style="{StaticResource FormatBarToggleButtonStyle}"
-                                  Command="{x:Static EditingCommands.ToggleItalic}" CommandTarget="{Binding ElementName=_window, Path=Target}"
-                                  ToolTip="Italic">
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Italic16.png" />
-                    </ToggleButton>
-                    <ToggleButton x:Name="_btnUnderline" Style="{StaticResource FormatBarToggleButtonStyle}"
-                                  Command="{x:Static EditingCommands.ToggleUnderline}" CommandTarget="{Binding ElementName=_window, Path=Target}"
-                                  ToolTip="Underline">
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Underline16.png" />
-                    </ToggleButton>
-
-                    <Separator />
-
-                    <RadioButton x:Name="_btnAlignLeft" Style="{StaticResource FormatBarToggleButtonStyle}"
-                                 Command="{x:Static EditingCommands.AlignLeft}"  CommandTarget="{Binding ElementName=_window, Path=Target}"
-                                 ToolTip="Align Left">
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/LeftAlign16.png" />
-                    </RadioButton>
-                    <RadioButton x:Name="_btnAlignCenter" Style="{StaticResource FormatBarToggleButtonStyle}"
-                                 Command="{x:Static EditingCommands.AlignCenter}"  CommandTarget="{Binding ElementName=_window, Path=Target}"
-                                 ToolTip="Align Center">
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/CenterAlign16.png" />
-                    </RadioButton>
-                    <RadioButton x:Name="_btnAlignRight" Style="{StaticResource FormatBarToggleButtonStyle}"
-                                 Command="{x:Static EditingCommands.AlignRight}"  CommandTarget="{Binding ElementName=_window, Path=Target}"
-                                 ToolTip="Align Right">
-                        <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/RightAlign16.png" />
-                    </RadioButton>
-
-                    <Separator />
-
-                    <extToolkit:ColorPicker x:Name="_cmbFontBackgroundColor" BorderThickness="0" 
-                                            ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
-                                            SelectedColorChanged="FontBackgroundColor_SelectedColorChanged"
-                                            ToolTip="Text Highlight Color"/>
-
-                    <extToolkit:ColorPicker x:Name="_cmbFontColor" BorderThickness="0" 
-                                            ButtonStyle="{StaticResource FontColorButtonStyle}"
-                                            SelectedColorChanged="FontColor_SelectedColorChanged"
-                                            ToolTip="Font Color"/>
-
-                </StackPanel>
+                   DragDelta="DragWidget_DragDelta" />
+
+         <StackPanel Grid.Row="1">
+            <StackPanel Orientation="Horizontal">
+               <ComboBox x:Name="_cmbFontFamilies"
+                         IsEditable="True"
+                         Width="100"
+                         SelectionChanged="FontFamily_SelectionChanged"
+                         ToolTip="Font Family" />
+
+               <ComboBox x:Name="_cmbFontSizes"
+                         IsEditable="True"
+                         Width="43"
+                         SelectionChanged="FontSize_SelectionChanged"
+                         ToolTip="Font Size"/>
+
+               <Separator />
+
+               <ToggleButton x:Name="_btnBullets"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="EditingCommands.ToggleBullets"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             Click="Bullets_Clicked"
+                             ToolTip="Bullets">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Bullets16.png" />
+               </ToggleButton>
+
+               <ToggleButton x:Name="_btnNumbers"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="EditingCommands.ToggleNumbering"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             Click="Numbers_Clicked"
+                             ToolTip="Numbering">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Numbering16.png" />
+               </ToggleButton>
 
             </StackPanel>
-        </Grid>
-    </Border>
+
+            <StackPanel Orientation="Horizontal" Margin="0,3,0,0">
+               <ToggleButton x:Name="_btnBold"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="EditingCommands.ToggleBold"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             ToolTip="Bold">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Bold16.png" />
+               </ToggleButton>
+               <ToggleButton x:Name="_btnItalic"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="{x:Static EditingCommands.ToggleItalic}"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             ToolTip="Italic">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Italic16.png" />
+               </ToggleButton>
+               <ToggleButton x:Name="_btnUnderline"
+                             Style="{StaticResource FormatBarToggleButtonStyle}"
+                             Command="{x:Static EditingCommands.ToggleUnderline}"
+                             CommandTarget="{Binding ElementName=_window, Path=Target}"
+                             ToolTip="Underline">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/Underline16.png" />
+               </ToggleButton>
+
+               <Separator />
+
+               <RadioButton x:Name="_btnAlignLeft"
+                            Style="{StaticResource FormatBarToggleButtonStyle}"
+                            Command="{x:Static EditingCommands.AlignLeft}"
+                            CommandTarget="{Binding ElementName=_window, Path=Target}"
+                            ToolTip="Align Left">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/LeftAlign16.png" />
+               </RadioButton>
+               <RadioButton x:Name="_btnAlignCenter"
+                            Style="{StaticResource FormatBarToggleButtonStyle}"
+                            Command="{x:Static EditingCommands.AlignCenter}"
+                            CommandTarget="{Binding ElementName=_window, Path=Target}"
+                            ToolTip="Align Center">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/CenterAlign16.png" />
+               </RadioButton>
+               <RadioButton x:Name="_btnAlignRight"
+                            Style="{StaticResource FormatBarToggleButtonStyle}"
+                            Command="{x:Static EditingCommands.AlignRight}"
+                            CommandTarget="{Binding ElementName=_window, Path=Target}"
+                            ToolTip="Align Right">
+                  <Image Source="/WPFToolkit.Extended;component/RichTextBoxFormatBar/Images/RightAlign16.png" />
+               </RadioButton>
+
+               <Separator />
+
+               <extToolkit:ColorPicker x:Name="_cmbFontBackgroundColor"
+                                       BorderThickness="0" 
+                                       ButtonStyle="{StaticResource FontBackgrounColorButtonStyle}"
+                                       SelectedColorChanged="FontBackgroundColor_SelectedColorChanged"
+                                       ToolTip="Text Highlight Color" />
+
+               <extToolkit:ColorPicker x:Name="_cmbFontColor"
+                                       BorderThickness="0" 
+                                       ButtonStyle="{StaticResource FontColorButtonStyle}"
+                                       SelectedColorChanged="FontColor_SelectedColorChanged"
+                                       ToolTip="Font Color" />
+
+            </StackPanel>
+
+         </StackPanel>
+      </Grid>
+   </Border>
 </UserControl>
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
index a8cb83c6..6f6077cb 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBar.xaml.cs
@@ -1,232 +1,255 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
 using System.Windows.Documents;
 using System.Windows.Media;
-using System.Windows.Controls.Primitives;
 using Microsoft.Windows.Controls.Core;
 
 namespace Microsoft.Windows.Controls
 {
-    /// <summary>
-    /// Interaction logic for RichTextBoxFormatBar.xaml
-    /// </summary>
-    public partial class RichTextBoxFormatBar : UserControl, IRichTextBoxFormatBar
-    {
-        #region Properties
+  /// <summary>
+  /// Interaction logic for RichTextBoxFormatBar.xaml
+  /// </summary>
+  public partial class RichTextBoxFormatBar : UserControl, IRichTextBoxFormatBar
+  {
+    #region Properties
 
-        #region RichTextBox
+    #region RichTextBox
 
-        public static readonly DependencyProperty TargetProperty = DependencyProperty.Register("Target", typeof(global::System.Windows.Controls.RichTextBox), typeof(RichTextBoxFormatBar), new PropertyMetadata(null, OnRichTextBoxPropertyChanged));
-        public global::System.Windows.Controls.RichTextBox Target
-        {
-            get { return (global::System.Windows.Controls.RichTextBox)GetValue(TargetProperty); }
-            set { SetValue(TargetProperty, value); }
-        }
+    public static readonly DependencyProperty TargetProperty = DependencyProperty.Register( "Target", typeof( global::System.Windows.Controls.RichTextBox ), typeof( RichTextBoxFormatBar ), new PropertyMetadata( null, OnRichTextBoxPropertyChanged ) );
+    public global::System.Windows.Controls.RichTextBox Target
+    {
+      get
+      {
+        return ( global::System.Windows.Controls.RichTextBox )GetValue( TargetProperty );
+      }
+      set
+      {
+        SetValue( TargetProperty, value );
+      }
+    }
 
-        private static void OnRichTextBoxPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            RichTextBoxFormatBar formatBar = d as RichTextBoxFormatBar;
-        }
+    private static void OnRichTextBoxPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      RichTextBoxFormatBar formatBar = d as RichTextBoxFormatBar;
+    }
 
-        #endregion //RichTextBox
+    #endregion //RichTextBox
 
-        public static double[] FontSizes
-        {
-            get
-            {
-                return new double[] { 
+    public static double[] FontSizes
+    {
+      get
+      {
+        return new double[] { 
 		            3.0, 4.0, 5.0, 6.0, 6.5, 7.0, 7.5, 8.0, 8.5, 9.0, 9.5, 
 		            10.0, 10.5, 11.0, 11.5, 12.0, 12.5, 13.0, 13.5, 14.0, 15.0,
 		            16.0, 17.0, 18.0, 19.0, 20.0, 22.0, 24.0, 26.0, 28.0, 30.0,
 		            32.0, 34.0, 36.0, 38.0, 40.0, 44.0, 48.0, 52.0, 56.0, 60.0, 64.0, 68.0, 72.0, 76.0,
 		            80.0, 88.0, 96.0, 104.0, 112.0, 120.0, 128.0, 136.0, 144.0
 		            };
-            }
-        }
+      }
+    }
 
-        #endregion
+    #endregion
 
-        #region Constructors
+    #region Constructors
 
-        public RichTextBoxFormatBar()
-        {
-            InitializeComponent();
-            Loaded += FormatToolbar_Loaded;
+    public RichTextBoxFormatBar()
+    {
+      InitializeComponent();
+      Loaded += FormatToolbar_Loaded;
 
-            _cmbFontFamilies.ItemsSource = Fonts.SystemFontFamilies;
-            _cmbFontSizes.ItemsSource = FontSizes;
-        }
+      _cmbFontFamilies.ItemsSource = Fonts.SystemFontFamilies;
+      _cmbFontSizes.ItemsSource = FontSizes;
+    }
 
-        #endregion //Constructors
+    #endregion //Constructors
 
-        #region Event Hanlders
+    #region Event Hanlders
 
-        void FormatToolbar_Loaded(object sender, RoutedEventArgs e)
-        {
-            UpdateVisualState();
-        }
+    void FormatToolbar_Loaded( object sender, RoutedEventArgs e )
+    {
+      UpdateVisualState();
+    }
 
-        private void FontFamily_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (e.AddedItems.Count == 0)
-                return;
+    private void FontFamily_SelectionChanged( object sender, SelectionChangedEventArgs e )
+    {
+      if( e.AddedItems.Count == 0 )
+        return;
 
-            FontFamily editValue = (FontFamily)e.AddedItems[0];
-            ApplyPropertyValueToSelectedText(TextElement.FontFamilyProperty, editValue);
-        }
+      FontFamily editValue = ( FontFamily )e.AddedItems[ 0 ];
+      ApplyPropertyValueToSelectedText( TextElement.FontFamilyProperty, editValue );
+    }
 
-        private void FontSize_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (e.AddedItems.Count == 0)
-                return;
+    private void FontSize_SelectionChanged( object sender, SelectionChangedEventArgs e )
+    {
+      if( e.AddedItems.Count == 0 )
+        return;
 
-            ApplyPropertyValueToSelectedText(TextElement.FontSizeProperty, e.AddedItems[0]);
-        }
+      ApplyPropertyValueToSelectedText( TextElement.FontSizeProperty, e.AddedItems[ 0 ] );
+    }
 
-        void FontColor_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color> e)
-        {
-            Color selectedColor = (Color)e.NewValue;
-            ApplyPropertyValueToSelectedText(TextElement.ForegroundProperty, new SolidColorBrush(selectedColor));
-        }
+    void FontColor_SelectedColorChanged( object sender, RoutedPropertyChangedEventArgs<Color> e )
+    {
+      Color selectedColor = ( Color )e.NewValue;
+      ApplyPropertyValueToSelectedText( TextElement.ForegroundProperty, new SolidColorBrush( selectedColor ) );
+    }
 
-        private void FontBackgroundColor_SelectedColorChanged(object sender, RoutedPropertyChangedEventArgs<Color> e)
-        {
-            Color selectedColor = (Color)e.NewValue;
-            ApplyPropertyValueToSelectedText(TextElement.BackgroundProperty, new SolidColorBrush(selectedColor));
-        }
+    private void FontBackgroundColor_SelectedColorChanged( object sender, RoutedPropertyChangedEventArgs<Color> e )
+    {
+      Color selectedColor = ( Color )e.NewValue;
+      ApplyPropertyValueToSelectedText( TextElement.BackgroundProperty, new SolidColorBrush( selectedColor ) );
+    }
 
-        private void Bullets_Clicked(object sender, RoutedEventArgs e)
-        {
-            if (BothSelectionListsAreChecked())
-            {
-                _btnNumbers.IsChecked = false;
-            }
-        }
+    private void Bullets_Clicked( object sender, RoutedEventArgs e )
+    {
+      if( BothSelectionListsAreChecked() )
+      {
+        _btnNumbers.IsChecked = false;
+      }
+    }
 
-        private void Numbers_Clicked(object sender, RoutedEventArgs e)
-        {
-            if (BothSelectionListsAreChecked())
-            {
-                _btnBullets.IsChecked = false;
-            }
-        }
+    private void Numbers_Clicked( object sender, RoutedEventArgs e )
+    {
+      if( BothSelectionListsAreChecked() )
+      {
+        _btnBullets.IsChecked = false;
+      }
+    }
 
-        private void DragWidget_DragDelta(object sender, DragDeltaEventArgs e)
-        {
-            ProcessMove(e);
-        }
+    private void DragWidget_DragDelta( object sender, DragDeltaEventArgs e )
+    {
+      ProcessMove( e );
+    }
 
-        #endregion //Event Hanlders
+    #endregion //Event Hanlders
 
-        #region Methods
+    #region Methods
 
-        private void UpdateVisualState()
-        {
-            UpdateToggleButtonState();
-            UpdateSelectedFontFamily();
-            UpdateSelectedFontSize();
-            UpdateFontColor();
-            UpdateFontBackgroundColor();
-            UpdateSelectionListType();
-        }
+    private void UpdateVisualState()
+    {
+      UpdateToggleButtonState();
+      UpdateSelectedFontFamily();
+      UpdateSelectedFontSize();
+      UpdateFontColor();
+      UpdateFontBackgroundColor();
+      UpdateSelectionListType();
+    }
 
-        private void UpdateToggleButtonState()
-        {
-            UpdateItemCheckedState(_btnBold, TextElement.FontWeightProperty, FontWeights.Bold);
-            UpdateItemCheckedState(_btnItalic, TextElement.FontStyleProperty, FontStyles.Italic);
-            UpdateItemCheckedState(_btnUnderline, Inline.TextDecorationsProperty, TextDecorations.Underline);
+    private void UpdateToggleButtonState()
+    {
+      UpdateItemCheckedState( _btnBold, TextElement.FontWeightProperty, FontWeights.Bold );
+      UpdateItemCheckedState( _btnItalic, TextElement.FontStyleProperty, FontStyles.Italic );
+      UpdateItemCheckedState( _btnUnderline, Inline.TextDecorationsProperty, TextDecorations.Underline );
 
-            UpdateItemCheckedState(_btnAlignLeft, Paragraph.TextAlignmentProperty, TextAlignment.Left);
-            UpdateItemCheckedState(_btnAlignCenter, Paragraph.TextAlignmentProperty, TextAlignment.Center);
-            UpdateItemCheckedState(_btnAlignRight, Paragraph.TextAlignmentProperty, TextAlignment.Right);
-        }
+      UpdateItemCheckedState( _btnAlignLeft, Paragraph.TextAlignmentProperty, TextAlignment.Left );
+      UpdateItemCheckedState( _btnAlignCenter, Paragraph.TextAlignmentProperty, TextAlignment.Center );
+      UpdateItemCheckedState( _btnAlignRight, Paragraph.TextAlignmentProperty, TextAlignment.Right );
+    }
 
-        void UpdateItemCheckedState(ToggleButton button, DependencyProperty formattingProperty, object expectedValue)
-        {
-            object currentValue = Target.Selection.GetPropertyValue(formattingProperty);
-            button.IsChecked = (currentValue == DependencyProperty.UnsetValue) ? false : currentValue != null && currentValue.Equals(expectedValue);
-        }
+    void UpdateItemCheckedState( ToggleButton button, DependencyProperty formattingProperty, object expectedValue )
+    {
+      object currentValue = Target.Selection.GetPropertyValue( formattingProperty );
+      button.IsChecked = ( currentValue == DependencyProperty.UnsetValue ) ? false : currentValue != null && currentValue.Equals( expectedValue );
+    }
 
-        private void UpdateSelectedFontFamily()
-        {
-            object value = Target.Selection.GetPropertyValue(TextElement.FontFamilyProperty);
-            FontFamily currentFontFamily = (FontFamily)((value == DependencyProperty.UnsetValue) ? null : value);
-            if (currentFontFamily != null)
-            {
-                _cmbFontFamilies.SelectedItem = currentFontFamily;
-            }
-        }
+    private void UpdateSelectedFontFamily()
+    {
+      object value = Target.Selection.GetPropertyValue( TextElement.FontFamilyProperty );
+      FontFamily currentFontFamily = ( FontFamily )( ( value == DependencyProperty.UnsetValue ) ? null : value );
+      if( currentFontFamily != null )
+      {
+        _cmbFontFamilies.SelectedItem = currentFontFamily;
+      }
+    }
 
-        private void UpdateSelectedFontSize()
-        {
-            object value = Target.Selection.GetPropertyValue(TextElement.FontSizeProperty);
-            _cmbFontSizes.SelectedValue = (value == DependencyProperty.UnsetValue) ? null : value;
-        }
+    private void UpdateSelectedFontSize()
+    {
+      object value = Target.Selection.GetPropertyValue( TextElement.FontSizeProperty );
+      _cmbFontSizes.SelectedValue = ( value == DependencyProperty.UnsetValue ) ? null : value;
+    }
 
-        private void UpdateFontColor()
-        {
-            object value = Target.Selection.GetPropertyValue(TextElement.ForegroundProperty);
-            Color currentColor = (Color)((value == DependencyProperty.UnsetValue) ? Colors.Black : ((SolidColorBrush)value).Color);
-            _cmbFontColor.SelectedColor = currentColor;
-        }
+    private void UpdateFontColor()
+    {
+      object value = Target.Selection.GetPropertyValue( TextElement.ForegroundProperty );
+      Color currentColor = ( Color )( ( value == DependencyProperty.UnsetValue ) ? Colors.Black : ( ( SolidColorBrush )value ).Color );
+      _cmbFontColor.SelectedColor = currentColor;
+    }
 
-        private void UpdateFontBackgroundColor()
-        {
-            object value = Target.Selection.GetPropertyValue(TextElement.BackgroundProperty);
-            Color currentColor = (Color)((value == null || value == DependencyProperty.UnsetValue) ? Colors.Transparent : ((SolidColorBrush)value).Color);
-            _cmbFontBackgroundColor.SelectedColor = currentColor;
-        }
+    private void UpdateFontBackgroundColor()
+    {
+      object value = Target.Selection.GetPropertyValue( TextElement.BackgroundProperty );
+      Color currentColor = ( Color )( ( value == null || value == DependencyProperty.UnsetValue ) ? Colors.Transparent : ( ( SolidColorBrush )value ).Color );
+      _cmbFontBackgroundColor.SelectedColor = currentColor;
+    }
+
+    /// <summary>
+    /// Updates the visual state of the List styles, such as Numbers and Bullets.
+    /// </summary>
+    private void UpdateSelectionListType()
+    {
+      //uncheck both
+      _btnBullets.IsChecked = false;
+      _btnNumbers.IsChecked = false;
 
-        /// <summary>
-        /// Updates the visual state of the List styles, such as Numbers and Bullets.
-        /// </summary>
-        private void UpdateSelectionListType()
+      Paragraph startParagraph = Target.Selection.Start.Paragraph;
+      Paragraph endParagraph = Target.Selection.End.Paragraph;
+      if( startParagraph != null && endParagraph != null && ( startParagraph.Parent is ListItem ) && ( endParagraph.Parent is ListItem ) && object.ReferenceEquals( ( ( ListItem )startParagraph.Parent ).List, ( ( ListItem )endParagraph.Parent ).List ) )
+      {
+        TextMarkerStyle markerStyle = ( ( ListItem )startParagraph.Parent ).List.MarkerStyle;
+        if( markerStyle == TextMarkerStyle.Disc ) //bullets
         {
-            //uncheck both
-            _btnBullets.IsChecked = false;
-            _btnNumbers.IsChecked = false;
-
-            Paragraph startParagraph = Target.Selection.Start.Paragraph;
-            Paragraph endParagraph = Target.Selection.End.Paragraph;
-            if (startParagraph != null && endParagraph != null && (startParagraph.Parent is ListItem) && (endParagraph.Parent is ListItem) && object.ReferenceEquals(((ListItem)startParagraph.Parent).List, ((ListItem)endParagraph.Parent).List))
-            {
-                TextMarkerStyle markerStyle = ((ListItem)startParagraph.Parent).List.MarkerStyle;
-                if (markerStyle == TextMarkerStyle.Disc) //bullets
-                {
-                    _btnBullets.IsChecked = true;
-                }
-                else if (markerStyle == TextMarkerStyle.Decimal) //numbers
-                {
-                    _btnNumbers.IsChecked = true;
-                }
-            }
+          _btnBullets.IsChecked = true;
         }
-
-        /// <summary>
-        /// Checks to see if both selection lists are checked. (Bullets and Numbers)
-        /// </summary>
-        /// <returns></returns>
-        private bool BothSelectionListsAreChecked()
+        else if( markerStyle == TextMarkerStyle.Decimal ) //numbers
         {
-            return _btnBullets.IsChecked == true && _btnNumbers.IsChecked == true;
+          _btnNumbers.IsChecked = true;
         }
+      }
+    }
 
-        void ApplyPropertyValueToSelectedText(DependencyProperty formattingProperty, object value)
-        {
-            if (value == null)
-                return;
+    /// <summary>
+    /// Checks to see if both selection lists are checked. (Bullets and Numbers)
+    /// </summary>
+    /// <returns></returns>
+    private bool BothSelectionListsAreChecked()
+    {
+      return _btnBullets.IsChecked == true && _btnNumbers.IsChecked == true;
+    }
 
-            Target.Selection.ApplyPropertyValue(formattingProperty, value);
-        }
+    void ApplyPropertyValueToSelectedText( DependencyProperty formattingProperty, object value )
+    {
+      if( value == null )
+        return;
 
-        private void ProcessMove(DragDeltaEventArgs e)
-        {
-            AdornerLayer layer = AdornerLayer.GetAdornerLayer(Target);
-            UIElementAdorner<Control> adorner = layer.GetAdorners(Target)[0] as UIElementAdorner<Control>;
-            adorner.SetOffsets(adorner.OffsetLeft + e.HorizontalChange, adorner.OffsetTop + e.VerticalChange);
-        }
+      Target.Selection.ApplyPropertyValue( formattingProperty, value );
+    }
 
-        #endregion //Methods
+    private void ProcessMove( DragDeltaEventArgs e )
+    {
+      AdornerLayer layer = AdornerLayer.GetAdornerLayer( Target );
+      UIElementAdorner<Control> adorner = layer.GetAdorners( Target )[ 0 ] as UIElementAdorner<Control>;
+      adorner.SetOffsets( adorner.OffsetLeft + e.HorizontalChange, adorner.OffsetTop + e.VerticalChange );
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
index f5a8f0ea..43f085b4 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/RichTextBoxFormatBar/RichTextBoxFormatBarManager.cs
@@ -1,196 +1,217 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Documents;
-using Microsoft.Windows.Controls.Core;
 using System.Windows.Input;
+using Microsoft.Windows.Controls.Core;
 
 namespace Microsoft.Windows.Controls
 {
-    public class RichTextBoxFormatBarManager : DependencyObject
-    {
-        #region Members
+  public class RichTextBoxFormatBarManager : DependencyObject
+  {
+    #region Members
 
-        private global::System.Windows.Controls.RichTextBox _richTextBox;
-        private UIElementAdorner<Control> _adorner;
-        private IRichTextBoxFormatBar _toolbar;
+    private global::System.Windows.Controls.RichTextBox _richTextBox;
+    private UIElementAdorner<Control> _adorner;
+    private IRichTextBoxFormatBar _toolbar;
 
-        #endregion //Members
+    #endregion //Members
 
-        #region Properties
+    #region Properties
 
-        #region FormatBar
+    #region FormatBar
 
-        public static readonly DependencyProperty FormatBarProperty = DependencyProperty.RegisterAttached("FormatBar", typeof(IRichTextBoxFormatBar), typeof(RichTextBox), new PropertyMetadata(null, OnFormatBarPropertyChanged));
-        public static void SetFormatBar(UIElement element, IRichTextBoxFormatBar value)
-        {
-            element.SetValue(FormatBarProperty, value);
-        }
-        public static IRichTextBoxFormatBar GetFormatBar(UIElement element)
-        {
-            return (IRichTextBoxFormatBar)element.GetValue(FormatBarProperty);
-        }
+    public static readonly DependencyProperty FormatBarProperty = DependencyProperty.RegisterAttached( "FormatBar", typeof( IRichTextBoxFormatBar ), typeof( RichTextBox ), new PropertyMetadata( null, OnFormatBarPropertyChanged ) );
+    public static void SetFormatBar( UIElement element, IRichTextBoxFormatBar value )
+    {
+      element.SetValue( FormatBarProperty, value );
+    }
+    public static IRichTextBoxFormatBar GetFormatBar( UIElement element )
+    {
+      return ( IRichTextBoxFormatBar )element.GetValue( FormatBarProperty );
+    }
 
-        private static void OnFormatBarPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            global::System.Windows.Controls.RichTextBox rtb = d as global::System.Windows.Controls.RichTextBox;
-            if (rtb == null)
-                throw new Exception("A FormatBar can only be applied to a RichTextBox.");
+    private static void OnFormatBarPropertyChanged( DependencyObject d, DependencyPropertyChangedEventArgs e )
+    {
+      global::System.Windows.Controls.RichTextBox rtb = d as global::System.Windows.Controls.RichTextBox;
+      if( rtb == null )
+        throw new Exception( "A FormatBar can only be applied to a RichTextBox." );
 
-            RichTextBoxFormatBarManager manager = new RichTextBoxFormatBarManager();
-            manager.AttachFormatBarToRichtextBox(rtb, e.NewValue as IRichTextBoxFormatBar);
-        }
+      RichTextBoxFormatBarManager manager = new RichTextBoxFormatBarManager();
+      manager.AttachFormatBarToRichtextBox( rtb, e.NewValue as IRichTextBoxFormatBar );
+    }
 
-        #endregion //FormatBar
+    #endregion //FormatBar
 
-        public bool IsAdornerVisible
-        {
-            get { return _adorner.Visibility == Visibility.Visible; }
-        }
+    public bool IsAdornerVisible
+    {
+      get
+      {
+        return _adorner.Visibility == Visibility.Visible;
+      }
+    }
 
-        #endregion //Properties
+    #endregion //Properties
 
-        #region Event Handlers
+    #region Event Handlers
 
-        void RichTextBox_MouseButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            if (e.ChangedButton == MouseButton.Left && e.LeftButton == MouseButtonState.Released)
-            {
-                TextRange selectedText = new TextRange(_richTextBox.Selection.Start, _richTextBox.Selection.End);
+    void RichTextBox_MouseButtonUp( object sender, MouseButtonEventArgs e )
+    {
+      if( e.ChangedButton == MouseButton.Left && e.LeftButton == MouseButtonState.Released )
+      {
+        TextRange selectedText = new TextRange( _richTextBox.Selection.Start, _richTextBox.Selection.End );
 #if !VS2008
-                if (selectedText.Text.Length > 0 && !String.IsNullOrWhiteSpace(selectedText.Text))
-                    ShowAdorner();
+        if( selectedText.Text.Length > 0 && !String.IsNullOrWhiteSpace( selectedText.Text ) )
+          ShowAdorner();
 #else
-                if (selectedText.Text.Length > 0 && !String.IsNullOrEmpty(selectedText.Text))
-                    ShowAdorner();
+        if( selectedText.Text.Length > 0 && !String.IsNullOrEmpty( selectedText.Text ) )
+          ShowAdorner();
 #endif
-                else
-                    HideAdorner();
-
-                e.Handled = true;
-            }
-            else
-                HideAdorner();
-        }
-
-        void RichTextBox_PreviewMouseMove(object sender, MouseEventArgs e)
-        {
-            //if the mouse moves outside the richtextbox bounds hide the adorner
-            //though this deosn't always work, especially if the user moves the mouse very quickly.
-            //need to find a better solution, but this will work for now.
-            Point p = e.GetPosition(_richTextBox);
-            if (p.X <= 5.0 || p.X >= _richTextBox.ActualWidth - 5 || p.Y <= 3.0 || p.Y >= _richTextBox.ActualHeight - 3)
-                HideAdorner();
-        }
-
-        void RichTextBox_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            //this fixes the bug when applying text transformations the text would lose it's highlight.  That was because the RichTextBox was losing focus
-            //so we just give it focus again and it seems to do the trick of re-highlighting it.
-            if (!_richTextBox.IsFocused && !_richTextBox.Selection.IsEmpty)
-                _richTextBox.Focus();
-        }
-
-        #endregion //Event Handlers
-
-        #region Methods
-
-        /// <summary>
-        /// Attaches a FormatBar to a RichtextBox
-        /// </summary>
-        /// <param name="richTextBox">The RichtextBox to attach to.</param>
-        /// <param name="formatBar">The Formatbar to attach.</param>
-        private void AttachFormatBarToRichtextBox(global::System.Windows.Controls.RichTextBox richTextBox, IRichTextBoxFormatBar formatBar)
-        {
-            _richTextBox = richTextBox;
-            _richTextBox.PreviewMouseMove += RichTextBox_PreviewMouseMove;
-            //we cannot use the PreviewMouseLeftButtonUp event because of selection bugs.
-            //we cannot use the MouseLeftButtonUp event because it is handled by the RichTextBox and does not bubble up to here, so we must
-            //add a hander to the MouseUpEvent using the Addhandler syntax, and specify to listen for handled events too.
-            _richTextBox.AddHandler(Mouse.MouseUpEvent, new MouseButtonEventHandler(RichTextBox_MouseButtonUp), true);
-            _richTextBox.TextChanged += RichTextBox_TextChanged;
-
-            _adorner = new UIElementAdorner<Control>(_richTextBox);
-
-            formatBar.Target = _richTextBox;
-            _toolbar = formatBar;
-        }
-
-        /// <summary>
-        /// Shows the FormatBar
-        /// </summary>
-        void ShowAdorner()
-        {
-            if (_adorner.Visibility == Visibility.Visible)
-                return;
-
-            VerifyAdornerLayer();
-
-            Control adorningEditor = _toolbar as Control;
-
-            if (_adorner.Child == null)
-                _adorner.Child = adorningEditor;
-
-            _adorner.Visibility = Visibility.Visible;
-
-            PositionFormatBar(adorningEditor);
-        }
-
-        /// <summary>
-        /// Positions the FormatBar so that is does not go outside the bounds of the RichTextBox or covers the selected text
-        /// </summary>
-        /// <param name="adorningEditor"></param>
-        private void PositionFormatBar(Control adorningEditor)
-        {
-            Point mousePosition = Mouse.GetPosition(_richTextBox);
-
-            double left = mousePosition.X;
-            double top = (mousePosition.Y - 15) - adorningEditor.ActualHeight;
-
-            //top
-            if (top < 0)
-            {
-                top = mousePosition.Y + 10;
-            }
-
-            //right boundary
-            if (left + adorningEditor.ActualWidth > _richTextBox.ActualWidth - 20)
-            {
-                left = left - (adorningEditor.ActualWidth - (_richTextBox.ActualWidth - left));
-            }
-
-            _adorner.SetOffsets(left, top);
-        }
-
-        /// <summary>
-        /// Ensures that the IRichTextFormatBar is in the adorner layer.
-        /// </summary>
-        /// <returns>True if the IRichTextFormatBar is in the adorner layer, else false.</returns>
-        bool VerifyAdornerLayer()
-        {
-            if (_adorner.Parent != null)
-                return true;
-
-            AdornerLayer layer = AdornerLayer.GetAdornerLayer(_richTextBox);
-            if (layer == null)
-                return false;
-
-            layer.Add(_adorner);
-            return true;
-        }
-
-        /// <summary>
-        /// Hides the IRichTextFormatBar that is in the adornor layer.
-        /// </summary>
-        void HideAdorner()
-        {
-            if (IsAdornerVisible)
-            {
-                _adorner.Visibility = Visibility.Collapsed;
-                //_adorner.Child = null;
-            }
-        }
-
-        #endregion //Methods
+        else
+          HideAdorner();
+
+        e.Handled = true;
+      }
+      else
+        HideAdorner();
+    }
+
+    void RichTextBox_PreviewMouseMove( object sender, MouseEventArgs e )
+    {
+      //if the mouse moves outside the richtextbox bounds hide the adorner
+      //though this deosn't always work, especially if the user moves the mouse very quickly.
+      //need to find a better solution, but this will work for now.
+      Point p = e.GetPosition( _richTextBox );
+      if( p.X <= 5.0 || p.X >= _richTextBox.ActualWidth - 5 || p.Y <= 3.0 || p.Y >= _richTextBox.ActualHeight - 3 )
+        HideAdorner();
+    }
+
+    void RichTextBox_TextChanged( object sender, TextChangedEventArgs e )
+    {
+      //this fixes the bug when applying text transformations the text would lose it's highlight.  That was because the RichTextBox was losing focus
+      //so we just give it focus again and it seems to do the trick of re-highlighting it.
+      if( !_richTextBox.IsFocused && !_richTextBox.Selection.IsEmpty )
+        _richTextBox.Focus();
+    }
+
+    #endregion //Event Handlers
+
+    #region Methods
+
+    /// <summary>
+    /// Attaches a FormatBar to a RichtextBox
+    /// </summary>
+    /// <param name="richTextBox">The RichtextBox to attach to.</param>
+    /// <param name="formatBar">The Formatbar to attach.</param>
+    private void AttachFormatBarToRichtextBox( global::System.Windows.Controls.RichTextBox richTextBox, IRichTextBoxFormatBar formatBar )
+    {
+      _richTextBox = richTextBox;
+      _richTextBox.PreviewMouseMove += RichTextBox_PreviewMouseMove;
+      //we cannot use the PreviewMouseLeftButtonUp event because of selection bugs.
+      //we cannot use the MouseLeftButtonUp event because it is handled by the RichTextBox and does not bubble up to here, so we must
+      //add a hander to the MouseUpEvent using the Addhandler syntax, and specify to listen for handled events too.
+      _richTextBox.AddHandler( Mouse.MouseUpEvent, new MouseButtonEventHandler( RichTextBox_MouseButtonUp ), true );
+      _richTextBox.TextChanged += RichTextBox_TextChanged;
+
+      _adorner = new UIElementAdorner<Control>( _richTextBox );
+
+      formatBar.Target = _richTextBox;
+      _toolbar = formatBar;
+    }
+
+    /// <summary>
+    /// Shows the FormatBar
+    /// </summary>
+    void ShowAdorner()
+    {
+      if( _adorner.Visibility == Visibility.Visible )
+        return;
+
+      VerifyAdornerLayer();
+
+      Control adorningEditor = _toolbar as Control;
+
+      if( _adorner.Child == null )
+        _adorner.Child = adorningEditor;
+
+      _adorner.Visibility = Visibility.Visible;
+
+      PositionFormatBar( adorningEditor );
     }
+
+    /// <summary>
+    /// Positions the FormatBar so that is does not go outside the bounds of the RichTextBox or covers the selected text
+    /// </summary>
+    /// <param name="adorningEditor"></param>
+    private void PositionFormatBar( Control adorningEditor )
+    {
+      Point mousePosition = Mouse.GetPosition( _richTextBox );
+
+      double left = mousePosition.X;
+      double top = ( mousePosition.Y - 15 ) - adorningEditor.ActualHeight;
+
+      //top
+      if( top < 0 )
+      {
+        top = mousePosition.Y + 10;
+      }
+
+      //right boundary
+      if( left + adorningEditor.ActualWidth > _richTextBox.ActualWidth - 20 )
+      {
+        left = left - ( adorningEditor.ActualWidth - ( _richTextBox.ActualWidth - left ) );
+      }
+
+      _adorner.SetOffsets( left, top );
+    }
+
+    /// <summary>
+    /// Ensures that the IRichTextFormatBar is in the adorner layer.
+    /// </summary>
+    /// <returns>True if the IRichTextFormatBar is in the adorner layer, else false.</returns>
+    bool VerifyAdornerLayer()
+    {
+      if( _adorner.Parent != null )
+        return true;
+
+      AdornerLayer layer = AdornerLayer.GetAdornerLayer( _richTextBox );
+      if( layer == null )
+        return false;
+
+      layer.Add( _adorner );
+      return true;
+    }
+
+    /// <summary>
+    /// Hides the IRichTextFormatBar that is in the adornor layer.
+    /// </summary>
+    void HideAdorner()
+    {
+      if( IsAdornerVisible )
+      {
+        _adorner.Visibility = Visibility.Collapsed;
+        //_adorner.Child = null;
+      }
+    }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs
index 42a00d17..ec307382 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Implementation/SplitButton.cs
@@ -1,28 +1,45 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 using System.Windows.Controls;
 
 namespace Microsoft.Windows.Controls
 {
-    public class SplitButton : DropDownButton
-    {
-        #region Constructors
-
-        static SplitButton()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(SplitButton), new FrameworkPropertyMetadata(typeof(SplitButton)));
-        }
+  public class SplitButton : DropDownButton
+  {
+    #region Constructors
 
-        #endregion //Constructors
+    static SplitButton()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( SplitButton ), new FrameworkPropertyMetadata( typeof( SplitButton ) ) );
+    }
 
-        #region Base Class Overrides
+    #endregion //Constructors
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-            Button = GetTemplateChild("PART_ActionButton") as Button;
-        }
+    #region Base Class Overrides
 
-        #endregion //Base Class Overrides
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+      Button = GetTemplateChild( "PART_ActionButton" ) as Button;
     }
+
+    #endregion //Base Class Overrides
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml
index b6951d72..1809b7d4 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml
@@ -1,108 +1,128 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-    
-    <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <!-- =============================================================================== -->
-    <!-- SplitButton                                                                     -->
-    <!-- =============================================================================== -->
+   <!-- =============================================================================== -->
+   <!-- SplitButton                                                                     -->
+   <!-- =============================================================================== -->
 
-    <Style TargetType="{x:Type local:SplitButton}">
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-        <Setter Property="Padding" Value="3"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:SplitButton}">
-                    <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
-                        <chrome:ButtonChrome x:Name="ControlChrome" Background="{TemplateBinding Background}" RenderEnabled="{TemplateBinding IsEnabled}" CornerRadius="2.75">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Button x:Name="PART_ActionButton" Margin="0" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" >
-                                    <Button.Template>
-                                        <ControlTemplate TargetType="Button">
-                                            <ContentPresenter />
-                                        </ControlTemplate>
-                                    </Button.Template>
-                                    <Grid>
-                                        <chrome:ButtonChrome x:Name="ActionButtonChrome"
-                                                         CornerRadius="2.75, 0, 0, 2.75"                                                         
-                                                         RenderNormal="False"
-                                                         RenderEnabled="{TemplateBinding IsEnabled}"
-											             RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
-											             RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}" >
-                                            <ContentPresenter Name="ActionButtonContent" Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
-                                        </chrome:ButtonChrome>
-                                    </Grid>
-                                </Button>
-                                <ToggleButton x:Name="PART_ToggleButton" Grid.Column="1" IsTabStop="False"
-                                                  IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                                                  IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" >
-                                    <ToggleButton.Template>
-                                        <ControlTemplate TargetType="ToggleButton">
-                                            <ContentPresenter />
-                                        </ControlTemplate>
-                                    </ToggleButton.Template>
-                                    <Grid>
-                                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"                                                         
-                                                         CornerRadius="0, 2.75, 2.75, 0"
-                                                         RenderNormal="False"
-                                                         RenderChecked="{TemplateBinding IsOpen}"
-                                                         RenderEnabled="{TemplateBinding IsEnabled}"
-											             RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
-											             RenderPressed="{Binding IsPressed, ElementName=PART_ToggleButton}" >
-                                            <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3">
-                                                <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                            </Grid>
-                                        </chrome:ButtonChrome>
-                                    </Grid>
-                                </ToggleButton>
-                            </Grid>
-                        </chrome:ButtonChrome>
+   <Style TargetType="{x:Type local:SplitButton}">
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:SplitButton}">
+               <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ControlChrome" Background="{TemplateBinding Background}" RenderEnabled="{TemplateBinding IsEnabled}" CornerRadius="2.75">
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Button x:Name="PART_ActionButton" Margin="0" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" >
+                           <Button.Template>
+                              <ControlTemplate TargetType="Button">
+                                 <ContentPresenter />
+                              </ControlTemplate>
+                           </Button.Template>
+                           <Grid>
+                              <chrome:ButtonChrome x:Name="ActionButtonChrome"
+                                                   CornerRadius="2.75, 0, 0, 2.75"                                                         
+                                                   RenderNormal="False"
+                                                   RenderEnabled="{TemplateBinding IsEnabled}"
+											                  RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
+											                  RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}">
+                                 <ContentPresenter Name="ActionButtonContent" Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
+                              </chrome:ButtonChrome>
+                           </Grid>
+                        </Button>
+                        <ToggleButton x:Name="PART_ToggleButton"
+                                      Grid.Column="1"
+                                      IsTabStop="False"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+                           <ToggleButton.Template>
+                              <ControlTemplate TargetType="ToggleButton">
+                                 <ContentPresenter />
+                              </ControlTemplate>
+                           </ToggleButton.Template>
+                           <Grid>
+                              <chrome:ButtonChrome x:Name="ToggleButtonChrome"                                                         
+                                                   CornerRadius="0, 2.75, 2.75, 0"
+                                                   RenderNormal="False"
+                                                   RenderChecked="{TemplateBinding IsOpen}"
+                                                   RenderEnabled="{TemplateBinding IsEnabled}"
+											                  RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
+											                  RenderPressed="{Binding IsPressed, ElementName=PART_ToggleButton}">
+                                 <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3">
+                                    <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                                 </Grid>
+                              </chrome:ButtonChrome>
+                           </Grid>
+                        </ToggleButton>
+                     </Grid>
+                  </chrome:ButtonChrome>
 
-                        <Popup x:Name="PART_Popup" 
-                               HorizontalOffset="1"
-                               VerticalOffset="1"
-                               AllowsTransparency="True"
-                               StaysOpen="False"
-                               Placement="Bottom"
-                               Focusable="False"
-                               IsOpen="{Binding IsChecked, ElementName=PART_ToggleButton}">
-                            <!-- TODO: Create Popup Styles that can be reused on all popups in the toolkit-->
-                            <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource ColorPickerDarkBorderBrush}" >
-                                <ContentPresenter Content="{TemplateBinding DropDownContent}" />
-                            </Border>
-                        </Popup>
+                  <Popup x:Name="PART_Popup" 
+                         HorizontalOffset="1"
+                         VerticalOffset="1"
+                         AllowsTransparency="True"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         Focusable="False"
+                         IsOpen="{Binding IsChecked, ElementName=PART_ToggleButton}">
+                     <!-- TODO: Create Popup Styles that can be reused on all popups in the toolkit-->
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource ColorPickerDarkBorderBrush}">
+                        <ContentPresenter Content="{TemplateBinding DropDownContent}" />
+                     </Border>
+                  </Popup>
 
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml
index b278e217..af6056fa 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml
@@ -1,9 +1,27 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Aero/Brushes_NormalColor.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Aero/Buttons_NormalColor.xaml" />
-    </ResourceDictionary.MergedDictionaries>    
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Aero/Brushes_NormalColor.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Aero/Buttons_NormalColor.xaml" />
+   </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml
index 746a159a..ca6d0cdd 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml
@@ -1,118 +1,136 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
                     xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes" >
 
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFF" PresentationOptions:Freeze="true"/>
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#F4F4F4" PresentationOptions:Freeze="true"/>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FFabadb3" Offset="0" />
-                <GradientStop Color="#FFdbdfe6" Offset="0.05000000074505806" />
-                <GradientStop Color="#FFdbdfe6" Offset="0.949999988079071" />
-                <GradientStop Color="#FFe3e9ef" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true" >
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FF3d7bad" Offset="0" />
-                <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
-                <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
-                <GradientStop Color="#FFb7d9ed" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FF3d7bad" Offset="0" />
-                <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
-                <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
-                <GradientStop Color="#FFb7d9ed" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFF" PresentationOptions:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#F4F4F4" PresentationOptions:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFabadb3" Offset="0" />
+            <GradientStop Color="#FFdbdfe6" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFdbdfe6" Offset="0.949999988079071" />
+            <GradientStop Color="#FFe3e9ef" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF3d7bad" Offset="0" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
+            <GradientStop Color="#FFb7d9ed" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF3d7bad" Offset="0" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
+            <GradientStop Color="#FFb7d9ed" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FFABADB3" />
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFfcfcfc" />
+            <GradientStop Offset="0.69" Color="#FFf9f9f9" />
+            <GradientStop Offset="0.69" Color="#FFf3f3f3" />
+            <GradientStop Offset="1" Color="#FFf3f3f3" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFf2f2f2" />
+            <GradientStop Offset="0.69" Color="#FFe8e8e8" />
+            <GradientStop Offset="0.69" Color="#FFd1d1d1" />
+            <GradientStop Offset="1" Color="#FFd1d1d1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FFABADB3"/>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFfcfcfc"/>
-                <GradientStop Offset="0.69" Color="#FFf9f9f9"/>
-                <GradientStop Offset="0.69" Color="#FFf3f3f3"/>
-                <GradientStop Offset="1" Color="#FFf3f3f3"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFf2f2f2"/>
-                <GradientStop Offset="0.69" Color="#FFe8e8e8"/>
-                <GradientStop Offset="0.69" Color="#FFd1d1d1"/>
-                <GradientStop Offset="1" Color="#FFd1d1d1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#FF3C7FB1" />
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFfafdfe" Offset="0" />
+            <GradientStop Color="#FFf5fbfe" Offset="0.5" />
+            <GradientStop Color="#FFeff9fe" Offset="0.5009999871253967" />
+            <GradientStop Color="#FFe8f5fc" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFeaf6fd" Offset="0" />
+            <GradientStop Color="#FFd9f0fc" Offset="0.5" />
+            <GradientStop Color="#FFbee6fd" Offset="0.5009999871253967" />
+            <GradientStop Color="#FFa7d9f5" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#FF3C7FB1"/>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FFfafdfe" Offset="0" />
-                <GradientStop Color="#FFf5fbfe" Offset="0.5" />
-                <GradientStop Color="#FFeff9fe" Offset="0.5009999871253967" />
-                <GradientStop Color="#FFe8f5fc" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FFeaf6fd" Offset="0" />
-                <GradientStop Color="#FFd9f0fc" Offset="0.5" />
-                <GradientStop Color="#FFbee6fd" Offset="0.5009999871253967" />
-                <GradientStop Color="#FFa7d9f5" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#FF2C628B" />
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF9eb0ba" Offset="0" />
+            <GradientStop Color="#FF9abacb" Offset="0.5" />
+            <GradientStop Color="#FF78aac5" Offset="0.5008999705314636" />
+            <GradientStop Color="#FF5a96b8" Offset="0.8999999761581421" />
+            <GradientStop Color="#FF68b2da" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFe5f4fc" Offset="0" />
+            <GradientStop Color="#FFc4e5f6" Offset="0.5" />
+            <GradientStop Color="#FF98d1ef" Offset="0.5009999871253967" />
+            <GradientStop Color="#FF68b3db" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#FF2C628B"/>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FF9eb0ba" Offset="0" />
-                <GradientStop Color="#FF9abacb" Offset="0.5" />
-                <GradientStop Color="#FF78aac5" Offset="0.5008999705314636" />
-                <GradientStop Color="#FF5a96b8" Offset="0.8999999761581421" />
-                <GradientStop Color="#FF68b2da" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FFe5f4fc" Offset="0" />
-                <GradientStop Color="#FFc4e5f6" Offset="0.5" />
-                <GradientStop Color="#FF98d1ef" Offset="0.5009999871253967" />
-                <GradientStop Color="#FF68b3db" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FF3d7bad" Offset="0" />
-                <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
-                <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
-                <GradientStop Color="#FFb7d9ed" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF3d7bad" Offset="0" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
+            <GradientStop Color="#FFb7d9ed" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml
index 5c5f8835..f5c772e0 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml
@@ -1,32 +1,52 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes">
 
-    <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="2,2"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="RepeatButton">
-                    <Grid>
-                        <chrome:ButtonChrome x:Name="Chrome"
-                                             BorderBrush="{TemplateBinding BorderBrush}" 
-                                             Background="{TemplateBinding Background}"                                                                  
-                                             CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
-                                             RenderEnabled="{TemplateBinding IsEnabled}"
-                                             RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                             RenderNormal="False"
-                                             RenderPressed="{TemplateBinding IsPressed}"
-                                             SnapsToDevicePixels="true" />
-
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Padding" Value="2,2" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="RepeatButton">
+               <Grid>
+                  <chrome:ButtonChrome x:Name="Chrome"
+                                       BorderBrush="{TemplateBinding BorderBrush}" 
+                                       Background="{TemplateBinding Background}"                                                                  
+                                       CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
+                                       RenderEnabled="{TemplateBinding IsEnabled}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderNormal="False"
+                                       RenderPressed="{TemplateBinding IsPressed}"
+                                       SnapsToDevicePixels="true" />
+
+                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Margin="{TemplateBinding Padding}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
index 34057e8e..e324c5ea 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic.xaml
@@ -1,36 +1,54 @@
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Brushes.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Buttons.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Common.xaml" />
-        
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Chromes/Themes/Generic.xaml" />
-        
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/BusyIndicator/Themes/Generic.xaml" />
-        
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/ButtonSpinner/Themes/Generic.xaml" />
-        
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Calculator/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/CalculatorUpDown/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/CheckComboBox/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/CheckListBox/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/ChildWindow/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/CollectionEditors/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/ColorCanvas/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/ColorPicker/Themes/Generic.xaml" />        
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/DropDownButton/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Magnifier/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/MessageBox/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/DateTimeUpDown/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/DateTimePicker/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/NumericUpDown/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/SplitButton/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/PropertyGrid/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/TimePicker/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/TokenizedTextBox/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/WatermarkTextBox/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Wizard/Themes/Generic.xaml" />
-    </ResourceDictionary.MergedDictionaries>    
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Brushes.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Buttons.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Common.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Chromes/Themes/Generic.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/BusyIndicator/Themes/Generic.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ButtonSpinner/Themes/Generic.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Calculator/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CalculatorUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CheckComboBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CheckListBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ChildWindow/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CollectionEditors/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ColorCanvas/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ColorPicker/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/DropDownButton/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Magnifier/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/MessageBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/DateTimeUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/DateTimePicker/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/NumericUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/SplitButton/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/PropertyGrid/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/TimePicker/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/TokenizedTextBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/WatermarkTextBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Wizard/Themes/Generic.xaml" />
+   </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml
index 2c6d59ea..95a77bef 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml
@@ -1,111 +1,128 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
                     xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes">
 
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFFFF" PresentationOptions:Freeze="true"/>
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#F4F4F4" PresentationOptions:Freeze="true"/>
-
-
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0"  PresentationOptions:Freeze="true">
-        <GradientStop Color="#ABADB3" Offset="0.05"/>
-        <GradientStop Color="#E2E3EA" Offset="0.07"/>
-        <GradientStop Color="#E3E9EF" Offset="1"/>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" StartPoint="0,0" EndPoint="0,1" PresentationOptions:Freeze="true" >
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#5794BF" Offset="0.05"/>
-                <GradientStop Color="#B7D5EA" Offset="0.07"/>
-                <GradientStop Color="#C7E2F1" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>       
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" StartPoint="0,0" EndPoint="0,1" PresentationOptions:Freeze="true">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#3D7BAD" Offset="0.05"/>
-                <GradientStop Color="#A4C9E3" Offset="0.07"/>
-                <GradientStop Color="#B7D9ED" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    
-
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FF707070" PresentationOptions:Freeze="true"/>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}" EndPoint="0,1" StartPoint="0,0" PresentationOptions:Freeze="true">
-        <GradientStop Color="#FAFFFFFF" Offset="0"/>
-        <GradientStop Color="#85FFFFFF" Offset="1"/>
-    </LinearGradientBrush>    
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#F3F3F3" Offset="0"/>
-                <GradientStop Color="#EBEBEB" Offset="0.5"/>
-                <GradientStop Color="#DDDDDD" Offset="0.5"/>
-                <GradientStop Color="#CDCDCD" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#3C7FB1"/>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FAFFFFFF" Offset="0"/>
-                <GradientStop Color="#85FFFFFF" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FFEAF6FD" Offset="0"/>
-                <GradientStop Color="#FFD9F0FC" Offset="0.50"/>
-                <GradientStop Color="#FFBEE6FD" Offset="0.50"/>
-                <GradientStop Color="#FFA7D9F5" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#2C628B"/>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FAFFFFFF" Offset="0"/>
-                <GradientStop Color="#85FFFFFF" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#C2E4F6" Offset="0.5"/>
-                <GradientStop Color="#ABDAF3" Offset="0.5"/>
-                <GradientStop Color="#90CBEB" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" Color="#FF707070" PresentationOptions:Freeze="true"/>
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedInnerBorderKey}" Color="#F900CCFF" PresentationOptions:Freeze="true"/>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}" EndPoint="0,1" StartPoint="0,0" PresentationOptions:Freeze="true">
-        <GradientStop Color="#FFEAF6FD" Offset="0"/>
-        <GradientStop Color="#FFD9F0FC" Offset="0.50"/>
-        <GradientStop Color="#FFBEE6FD" Offset="0.50"/>
-        <GradientStop Color="#FFA7D9F5" Offset="1"/>
-    </LinearGradientBrush>
-
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}" Color="#ADB2B5" PresentationOptions:Freeze="true"/>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonInnerBorderDisabledKey}" EndPoint="0,1" StartPoint="0,0" PresentationOptions:Freeze="true">
-        <GradientStop Color="#FAFFFFFF" Offset="0"/>
-        <GradientStop Color="#85FFFFFF" Offset="1"/>
-    </LinearGradientBrush>
-
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphNormalForegroundKey}" Color="#FF000000" />
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}" Color="#A9A9A9" />
-    
-    <CornerRadius x:Key="{x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}" TopLeft="0" TopRight="0" BottomRight="0" BottomLeft="0" PresentationOptions:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFFFF" PresentationOptions:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#F4F4F4" PresentationOptions:Freeze="true" />
+
+
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0"  PresentationOptions:Freeze="true">
+      <GradientStop Color="#ABADB3" Offset="0.05" />
+      <GradientStop Color="#E2E3EA" Offset="0.07" />
+      <GradientStop Color="#E3E9EF" Offset="1" />
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" StartPoint="0,0" EndPoint="0,1" PresentationOptions:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#5794BF" Offset="0.05" />
+            <GradientStop Color="#B7D5EA" Offset="0.07" />
+            <GradientStop Color="#C7E2F1" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" StartPoint="0,0" EndPoint="0,1" PresentationOptions:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#3D7BAD" Offset="0.05" />
+            <GradientStop Color="#A4C9E3" Offset="0.07" />
+            <GradientStop Color="#B7D9ED" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FF707070" PresentationOptions:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}" EndPoint="0,1" StartPoint="0,0" PresentationOptions:Freeze="true">
+      <GradientStop Color="#FAFFFFFF" Offset="0" />
+      <GradientStop Color="#85FFFFFF" Offset="1" />
+   </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#F3F3F3" Offset="0" />
+            <GradientStop Color="#EBEBEB" Offset="0.5" />
+            <GradientStop Color="#DDDDDD" Offset="0.5" />
+            <GradientStop Color="#CDCDCD" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#3C7FB1" />
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FAFFFFFF" Offset="0" />
+            <GradientStop Color="#85FFFFFF" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFEAF6FD" Offset="0" />
+            <GradientStop Color="#FFD9F0FC" Offset="0.50" />
+            <GradientStop Color="#FFBEE6FD" Offset="0.50" />
+            <GradientStop Color="#FFA7D9F5" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#2C628B" />
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FAFFFFFF" Offset="0" />
+            <GradientStop Color="#85FFFFFF" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#C2E4F6" Offset="0.5" />
+            <GradientStop Color="#ABDAF3" Offset="0.5" />
+            <GradientStop Color="#90CBEB" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" Color="#FF707070" PresentationOptions:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedInnerBorderKey}" Color="#F900CCFF" PresentationOptions:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}" EndPoint="0,1" StartPoint="0,0" PresentationOptions:Freeze="true">
+      <GradientStop Color="#FFEAF6FD" Offset="0" />
+      <GradientStop Color="#FFD9F0FC" Offset="0.50" />
+      <GradientStop Color="#FFBEE6FD" Offset="0.50" />
+      <GradientStop Color="#FFA7D9F5" Offset="1" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}" Color="#ADB2B5" PresentationOptions:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonInnerBorderDisabledKey}" EndPoint="0,1" StartPoint="0,0" PresentationOptions:Freeze="true">
+      <GradientStop Color="#FAFFFFFF" Offset="0" />
+      <GradientStop Color="#85FFFFFF" Offset="1" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphNormalForegroundKey}" Color="#FF000000" />
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}" Color="#A9A9A9" />
+
+   <CornerRadius x:Key="{x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}" TopLeft="0" TopRight="0" BottomRight="0" BottomLeft="0" PresentationOptions:Freeze="true" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml
index b0fafa10..0c213b41 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml
@@ -1,30 +1,50 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes">
 
-    <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="2,2"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="RepeatButton">
-                    <Grid>
-                        <chrome:ButtonChrome x:Name="Chrome"
-                                             BorderBrush="{TemplateBinding BorderBrush}" 
-                                             Background="{TemplateBinding Background}"                                                                  
-                                             CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
-                                             RenderEnabled="{TemplateBinding IsEnabled}"
-                                             RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                             RenderNormal="True"
-                                             RenderPressed="{TemplateBinding IsPressed}"
-                                             SnapsToDevicePixels="true" />
-
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Padding" Value="2,2" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="RepeatButton">
+               <Grid>
+                  <chrome:ButtonChrome x:Name="Chrome"
+                                       BorderBrush="{TemplateBinding BorderBrush}" 
+                                       Background="{TemplateBinding Background}"                                                                  
+                                       CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
+                                       RenderEnabled="{TemplateBinding IsEnabled}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderNormal="True"
+                                       RenderPressed="{TemplateBinding IsPressed}"
+                                       SnapsToDevicePixels="true" />
+
+                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Margin="{TemplateBinding Padding}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml
index 555f772a..52ac1056 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml
@@ -1,4 +1,22 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
                     xmlns:sys="clr-namespace:System;assembly=mscorlib" 
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
@@ -7,129 +25,131 @@
                     xmlns:magConverters="clr-namespace:Microsoft.Windows.Controls.Mag.Converters"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes">
 
-    <!-- =============================================================================== -->
-    <!-- Common Styles                                                                   -->
-    <!-- Need to find a way to share these for ChildWIndow and MessageBox                -->
-    <!-- =============================================================================== -->
-
-    <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="0.479" Color="#FFf4f5f6"/>
-                <GradientStop Offset="1" Color="#FFd0d6db"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFb5bdc8"/>
-                <GradientStop Offset="0.370" Color="#FF8399a9"/>
-                <GradientStop Offset="0.370" Color="#FF718597"/>
-                <GradientStop Offset="0.906" Color="#FFb9c1ca"/>
-                <GradientStop Offset="1" Color="#FFb9c1ca"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FF6b7c8d"/>
-                <GradientStop Offset="0.370" Color="#FF4d606f"/>
-                <GradientStop Offset="0.370" Color="#FF465460"/>
-                <GradientStop Offset="0.906" Color="#FF262d33"/>
-                <GradientStop Offset="1" Color="#FF262d33"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="#FF000000"/>
-        <Setter Property="Padding" Value="3"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}"></DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}"></DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
-                            <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0"/>
-                        </Border>
-                        <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                        <Path x:Name="path"
-								Height="6"
-								Width="7"
-								Stretch="Fill"
-								Opacity="1"
-								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
-								Fill="White" Margin="0,0,0,1" Visibility="Collapsed" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-
-    <!-- =============================================================================== -->
-    <!-- SelectorItem                                                                    -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type primitives:SelectorItem}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
-                    <Border x:Name="_background"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <CheckBox Name="PART_CheckBox" IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Focusable="False"  Margin="3,1,5,1"/>
-                            <Border Grid.Column="1">
-                                <ContentPresenter Margin="2" ContentSource="Content" />
-                            </Border>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="_background" Property="Background" Value="Blue"/>
-                            <Setter Property="Foreground" Value="White"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <!-- =============================================================================== -->
+   <!-- Common Styles                                                                   -->
+   <!-- Need to find a way to share these for ChildWIndow and MessageBox                -->
+   <!-- =============================================================================== -->
+
+   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFb5bdc8" />
+            <GradientStop Offset="0.370" Color="#FF8399a9" />
+            <GradientStop Offset="0.370" Color="#FF718597" />
+            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
+            <GradientStop Offset="1" Color="#FFb9c1ca" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FF6b7c8d" />
+            <GradientStop Offset="0.370" Color="#FF4d606f" />
+            <GradientStop Offset="0.370" Color="#FF465460" />
+            <GradientStop Offset="0.906" Color="#FF262d33" />
+            <GradientStop Offset="1" Color="#FF262d33" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
+      <Setter Property="Foreground" Value="#FF000000" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Button">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
+                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                  <Path x:Name="path"
+                        Height="6"
+                        Width="7"
+                        Stretch="Fill"
+                        Opacity="1"
+                        Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
+                        Fill="White"
+                        Margin="0,0,0,1"
+                        Visibility="Collapsed" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+
+   <!-- =============================================================================== -->
+   <!-- SelectorItem                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type primitives:SelectorItem}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
+               <Border x:Name="_background"
+                       Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                     </Grid.ColumnDefinitions>
+                     <CheckBox Name="PART_CheckBox" IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Focusable="False"  Margin="3,1,5,1" />
+                     <Border Grid.Column="1">
+                        <ContentPresenter Margin="2" ContentSource="Content" />
+                     </Border>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter TargetName="_background" Property="Background" Value="Blue" />
+                     <Setter Property="Foreground" Value="White" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml
index 4470f70f..2ef3a96e 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml
@@ -1,47 +1,69 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes" >
+                    xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes">
 
-    <Geometry x:Key="UpArrowGeometry">M 0,3 C0,3 0,4 0,4 0,4 3,4 3,4 3,4 3,3 3,3 3,3 4,3 4,3 4,3 4,4 4,4 4,4 7,4 7,4 7,4 7,3 7,3 7,3 6,3 6,3 6,3 6,2 6,2 6,2 5,2 5,2 5,2 5,1 5,1 5,1 4,1 4,1 4,1 4,0 4,0 4,0 3,0 3,0 3,0 3,1 3,1 3,1 2,1 2,1 2,1 2,2 2,2 2,2 1,2 1,2 1,2 1,3 1,3 1,3 0,3 0,3 z</Geometry>
-    <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+   <Geometry x:Key="UpArrowGeometry">M 0,3 C0,3 0,4 0,4 0,4 3,4 3,4 3,4 3,3 3,3 3,3 4,3 4,3 4,3 4,4 4,4 4,4 7,4 7,4 7,4 7,3 7,3 7,3 6,3 6,3 6,3 6,2 6,2 6,2 5,2 5,2 5,2 5,1 5,1 5,1 4,1 4,1 4,1 4,0 4,0 4,0 3,0 3,0 3,0 3,1 3,1 3,1 2,1 2,1 2,1 2,2 2,2 2,2 1,2 1,2 1,2 1,3 1,3 1,3 0,3 0,3 z</Geometry>
+   <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
 
-    <DataTemplate x:Key="IncreaseGlyphNormalKey">
-        <Path
-			Width="7"
-			Height="4"
-			Data="{StaticResource UpArrowGeometry}"
-			Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
+   <DataTemplate x:Key="IncreaseGlyphNormalKey">
+      <Path Width="7"
+            Height="4"
+            Data="{StaticResource UpArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
             SnapsToDevicePixels="True"
-             HorizontalAlignment="Center" VerticalAlignment="Center" Focusable="False" />
-    </DataTemplate>
-    <DataTemplate x:Key="IncreaseGlyphDisabledKey">
-        <Path
-			Width="7"
-			Height="4"
-			Data="{StaticResource UpArrowGeometry}"
-			Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+   <DataTemplate x:Key="IncreaseGlyphDisabledKey">
+      <Path	Width="7"
+            Height="4"
+            Data="{StaticResource UpArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
             SnapsToDevicePixels="True"
-             HorizontalAlignment="Center" VerticalAlignment="Center" Focusable="False" />
-    </DataTemplate>
-
-    <DataTemplate x:Key="DecreaseGlyphNormalKey">
-        <Path
-			Width="7"
-			Height="4"
-			Data="{StaticResource DownArrowGeometry}"
-			Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+
+   <DataTemplate x:Key="DecreaseGlyphNormalKey">
+      <Path Width="7"
+            Height="4"
+            Data="{StaticResource DownArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
             SnapsToDevicePixels="True"
-             HorizontalAlignment="Center" VerticalAlignment="Center" Focusable="False" />
-    </DataTemplate>
-
-    <DataTemplate x:Key="DecreaseGlyphDisabledKey">
-        <Path
-			Width="7"
-			Height="4"
-			Data="{StaticResource DownArrowGeometry}"
-			Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+
+   <DataTemplate x:Key="DecreaseGlyphDisabledKey">
+      <Path	Width="7"
+            Height="4"
+            Data="{StaticResource DownArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
             SnapsToDevicePixels="True"
-             HorizontalAlignment="Center" VerticalAlignment="Center" Focusable="False" />
-    </DataTemplate>
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs
index 0e0714ed..4dfa5ea0 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeFormat.cs
@@ -1,10 +1,28 @@
-
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+
 namespace Microsoft.Windows.Controls
 {
-    public enum TimeFormat
-    {
-        Custom,
-        ShortTime,
-        LongTime
-    }
+  public enum TimeFormat
+  {
+    Custom,
+    ShortTime,
+    LongTime
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs
index 6b88f1d5..f342e3a5 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimeItem.cs
@@ -1,34 +1,60 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 
 namespace Microsoft.Windows.Controls
 {
-    public class TimeItem
+  public class TimeItem
+  {
+    public string Display
+    {
+      get;
+      set;
+    }
+    public TimeSpan Time
     {
-        public string Display { get; set; }
-        public TimeSpan Time { get; set; }
-
-        public TimeItem(string display, TimeSpan time)
-        {
-            Display = display;
-            Time = time;
-        }
-
-        #region Base Class Overrides
-
-        public override bool Equals(object obj)
-        {
-            var item = obj as TimeItem;
-            if (item != null)
-                return Time == item.Time;
-            else
-                return false;
-        }
-
-        public override int GetHashCode()
-        {
-            return Time.GetHashCode();
-        }
-
-        #endregion //Base Class Overrides
+      get;
+      set;
     }
+
+    public TimeItem( string display, TimeSpan time )
+    {
+      Display = display;
+      Time = time;
+    }
+
+    #region Base Class Overrides
+
+    public override bool Equals( object obj )
+    {
+      var item = obj as TimeItem;
+      if( item != null )
+        return Time == item.Time;
+      else
+        return false;
+    }
+
+    public override int GetHashCode()
+    {
+      return Time.GetHashCode();
+    }
+
+    #endregion //Base Class Overrides
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs
index dc09d15d..321b17b5 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Implementation/TimePicker.cs
@@ -1,432 +1,515 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
+using System.Collections;
+using System.Globalization;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
-using System.Collections;
-using System.Globalization;
 
 namespace Microsoft.Windows.Controls
 {
-    public class TimePicker : Control
+  public class TimePicker : Control
+  {
+    #region Members
+
+    ListBox _timeListBox;
+    private DateTimeFormatInfo DateTimeFormatInfo
     {
-        #region Members
+      get;
+      set;
+    }
+    internal static readonly TimeSpan EndTimeDefaultValue = new TimeSpan( 23, 59, 0 );
+    internal static readonly TimeSpan StartTimeDefaultValue = new TimeSpan( 0, 0, 0 );
+    internal static readonly TimeSpan TimeIntervalDefaultValue = new TimeSpan( 1, 0, 0 );
 
-        ListBox _timeListBox;
-        private DateTimeFormatInfo DateTimeFormatInfo { get; set; }
-        internal static readonly TimeSpan EndTimeDefaultValue = new TimeSpan(23, 59, 0);
-        internal static readonly TimeSpan StartTimeDefaultValue = new TimeSpan(0, 0, 0);
-        internal static readonly TimeSpan TimeIntervalDefaultValue = new TimeSpan(1, 0, 0);
+    #endregion //Members
 
-        #endregion //Members
+    #region Properties
 
-        #region Properties
+    #region AllowSpin
 
-        #region AllowSpin
+    public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register( "AllowSpin", typeof( bool ), typeof( TimePicker ), new UIPropertyMetadata( true ) );
+    public bool AllowSpin
+    {
+      get
+      {
+        return ( bool )GetValue( AllowSpinProperty );
+      }
+      set
+      {
+        SetValue( AllowSpinProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty AllowSpinProperty = DependencyProperty.Register("AllowSpin", typeof(bool), typeof(TimePicker), new UIPropertyMetadata(true));
-        public bool AllowSpin
-        {
-            get { return (bool)GetValue(AllowSpinProperty); }
-            set { SetValue(AllowSpinProperty, value); }
-        }
+    #endregion //AllowSpin
 
-        #endregion //AllowSpin
+    #region EndTime
 
-        #region EndTime
+    public static readonly DependencyProperty EndTimeProperty = DependencyProperty.Register( "EndTime", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( EndTimeDefaultValue, new PropertyChangedCallback( OnEndTimeChanged ), new CoerceValueCallback( OnCoerceEndTime ) ) );
 
-        public static readonly DependencyProperty EndTimeProperty = DependencyProperty.Register("EndTime", typeof(TimeSpan), typeof(TimePicker), new UIPropertyMetadata(EndTimeDefaultValue, new PropertyChangedCallback(OnEndTimeChanged), new CoerceValueCallback(OnCoerceEndTime)));
+    private static object OnCoerceEndTime( DependencyObject o, object value )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        return timePicker.OnCoerceEndTime( ( TimeSpan )value );
+      else
+        return value;
+    }
 
-        private static object OnCoerceEndTime(DependencyObject o, object value)
-        {
-            TimePicker timePicker = o as TimePicker;
-            if (timePicker != null)
-                return timePicker.OnCoerceEndTime((TimeSpan)value);
-            else
-                return value;
-        }
+    private static void OnEndTimeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnEndTimeChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
+    }
 
-        private static void OnEndTimeChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            TimePicker timePicker = o as TimePicker;
-            if (timePicker != null)
-                timePicker.OnEndTimeChanged((TimeSpan)e.OldValue, (TimeSpan)e.NewValue);
-        }
+    protected virtual TimeSpan OnCoerceEndTime( TimeSpan value )
+    {
+      // TODO: Keep the proposed value within the desired range.
+      return value;
+    }
 
-        protected virtual TimeSpan OnCoerceEndTime(TimeSpan value)
-        {
-            // TODO: Keep the proposed value within the desired range.
-            return value;
-        }
+    protected virtual void OnEndTimeChanged( TimeSpan oldValue, TimeSpan newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
 
-        protected virtual void OnEndTimeChanged(TimeSpan oldValue, TimeSpan newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
+    public TimeSpan EndTime
+    {
+      // IMPORTANT: To maintain parity between setting a property in XAML and procedural code, do not touch the getter and setter inside this dependency property!
+      get
+      {
+        return ( TimeSpan )GetValue( EndTimeProperty );
+      }
+      set
+      {
+        SetValue( EndTimeProperty, value );
+      }
+    }
 
-        public TimeSpan EndTime
-        {
-            // IMPORTANT: To maintain parity between setting a property in XAML and procedural code, do not touch the getter and setter inside this dependency property!
-            get
-            {
-                return (TimeSpan)GetValue(EndTimeProperty);
-            }
-            set
-            {
-                SetValue(EndTimeProperty, value);
-            }
-        }
 
+    #endregion //EndTime
 
-        #endregion //EndTime
+    #region Format
 
-        #region Format
+    public static readonly DependencyProperty FormatProperty = DependencyProperty.Register( "Format", typeof( TimeFormat ), typeof( TimePicker ), new UIPropertyMetadata( TimeFormat.ShortTime, OnFormatChanged ) );
+    public TimeFormat Format
+    {
+      get
+      {
+        return ( TimeFormat )GetValue( FormatProperty );
+      }
+      set
+      {
+        SetValue( FormatProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty FormatProperty = DependencyProperty.Register("Format", typeof(TimeFormat), typeof(TimePicker), new UIPropertyMetadata(TimeFormat.ShortTime, OnFormatChanged));
-        public TimeFormat Format
-        {
-            get { return (TimeFormat)GetValue(FormatProperty); }
-            set { SetValue(FormatProperty, value); }
-        }
+    private static void OnFormatChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnFormatChanged( ( TimeFormat )e.OldValue, ( TimeFormat )e.NewValue );
+    }
 
-        private static void OnFormatChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            TimePicker timePicker = o as TimePicker;
-            if (timePicker != null)
-                timePicker.OnFormatChanged((TimeFormat)e.OldValue, (TimeFormat)e.NewValue);
-        }
+    protected virtual void OnFormatChanged( TimeFormat oldValue, TimeFormat newValue )
+    {
 
-        protected virtual void OnFormatChanged(TimeFormat oldValue, TimeFormat newValue)
-        {
+    }
 
-        }
+    #endregion //Format
 
-        #endregion //Format
+    #region FormatString
 
-        #region FormatString
+    public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register( "FormatString", typeof( string ), typeof( TimePicker ), new UIPropertyMetadata( default( String ), OnFormatStringChanged ) );
+    public string FormatString
+    {
+      get
+      {
+        return ( string )GetValue( FormatStringProperty );
+      }
+      set
+      {
+        SetValue( FormatStringProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty FormatStringProperty = DependencyProperty.Register("FormatString", typeof(string), typeof(TimePicker), new UIPropertyMetadata(default(String), OnFormatStringChanged));
-        public string FormatString
-        {
-            get { return (string)GetValue(FormatStringProperty); }
-            set { SetValue(FormatStringProperty, value); }
-        }
+    private static void OnFormatStringChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnFormatStringChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
 
-        private static void OnFormatStringChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            TimePicker timePicker = o as TimePicker;
-            if (timePicker != null)
-                timePicker.OnFormatStringChanged((string)e.OldValue, (string)e.NewValue);
-        }
+    protected virtual void OnFormatStringChanged( string oldValue, string newValue )
+    {
+      if( string.IsNullOrEmpty( newValue ) )
+        throw new ArgumentException( "CustomFormat should be specified.", FormatString );
+    }
 
-        protected virtual void OnFormatStringChanged(string oldValue, string newValue)
-        {
-            if (string.IsNullOrEmpty(newValue))
-                throw new ArgumentException("CustomFormat should be specified.", FormatString);
-        }
+    #endregion //FormatString
 
-        #endregion //FormatString
+    #region IsOpen
 
-        #region IsOpen
+    public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register( "IsOpen", typeof( bool ), typeof( TimePicker ), new UIPropertyMetadata( false ) );
+    public bool IsOpen
+    {
+      get
+      {
+        return ( bool )GetValue( IsOpenProperty );
+      }
+      set
+      {
+        SetValue( IsOpenProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty IsOpenProperty = DependencyProperty.Register("IsOpen", typeof(bool), typeof(TimePicker), new UIPropertyMetadata(false));
-        public bool IsOpen
-        {
-            get { return (bool)GetValue(IsOpenProperty); }
-            set { SetValue(IsOpenProperty, value); }
-        }
+    #endregion //IsOpen
 
-        #endregion //IsOpen
+    #region Maximum
 
-        #region Maximum
 
 
+    #endregion //Maximum
 
-        #endregion //Maximum
+    #region Minimum
 
-        #region Minimum
 
 
+    #endregion //Minimum
 
-        #endregion //Minimum
+    #region ShowButtonSpinner
 
-        #region ShowButtonSpinner
+    public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register( "ShowButtonSpinner", typeof( bool ), typeof( TimePicker ), new UIPropertyMetadata( true ) );
+    public bool ShowButtonSpinner
+    {
+      get
+      {
+        return ( bool )GetValue( ShowButtonSpinnerProperty );
+      }
+      set
+      {
+        SetValue( ShowButtonSpinnerProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty ShowButtonSpinnerProperty = DependencyProperty.Register("ShowButtonSpinner", typeof(bool), typeof(TimePicker), new UIPropertyMetadata(true));
-        public bool ShowButtonSpinner
-        {
-            get { return (bool)GetValue(ShowButtonSpinnerProperty); }
-            set { SetValue(ShowButtonSpinnerProperty, value); }
-        }
+    #endregion //ShowButtonSpinner
 
-        #endregion //ShowButtonSpinner
+    #region StartTime
 
-        #region StartTime
+    public static readonly DependencyProperty StartTimeProperty = DependencyProperty.Register( "StartTime", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( StartTimeDefaultValue, new PropertyChangedCallback( OnStartTimeChanged ), new CoerceValueCallback( OnCoerceStartTime ) ) );
 
-        public static readonly DependencyProperty StartTimeProperty = DependencyProperty.Register("StartTime", typeof(TimeSpan), typeof(TimePicker), new UIPropertyMetadata(StartTimeDefaultValue, new PropertyChangedCallback(OnStartTimeChanged), new CoerceValueCallback(OnCoerceStartTime)));
+    private static object OnCoerceStartTime( DependencyObject o, object value )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        return timePicker.OnCoerceStartTime( ( TimeSpan )value );
+      else
+        return value;
+    }
 
-        private static object OnCoerceStartTime(DependencyObject o, object value)
-        {
-            TimePicker timePicker = o as TimePicker;
-            if (timePicker != null)
-                return timePicker.OnCoerceStartTime((TimeSpan)value);
-            else
-                return value;
-        }
+    private static void OnStartTimeChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnStartTimeChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
+    }
 
-        private static void OnStartTimeChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            TimePicker timePicker = o as TimePicker;
-            if (timePicker != null)
-                timePicker.OnStartTimeChanged((TimeSpan)e.OldValue, (TimeSpan)e.NewValue);
-        }
+    protected virtual TimeSpan OnCoerceStartTime( TimeSpan value )
+    {
+      // TODO: Keep the proposed value within the desired range.
+      return value;
+    }
 
-        protected virtual TimeSpan OnCoerceStartTime(TimeSpan value)
-        {
-            // TODO: Keep the proposed value within the desired range.
-            return value;
-        }
+    protected virtual void OnStartTimeChanged( TimeSpan oldValue, TimeSpan newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
 
-        protected virtual void OnStartTimeChanged(TimeSpan oldValue, TimeSpan newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
+    public TimeSpan StartTime
+    {
+      // IMPORTANT: To maintain parity between setting a property in XAML and procedural code, do not touch the getter and setter inside this dependency property!
+      get
+      {
+        return ( TimeSpan )GetValue( StartTimeProperty );
+      }
+      set
+      {
+        SetValue( StartTimeProperty, value );
+      }
+    }
 
-        public TimeSpan StartTime
-        {
-            // IMPORTANT: To maintain parity between setting a property in XAML and procedural code, do not touch the getter and setter inside this dependency property!
-            get
-            {
-                return (TimeSpan)GetValue(StartTimeProperty);
-            }
-            set
-            {
-                SetValue(StartTimeProperty, value);
-            }
-        }
 
+    #endregion //StartTime
 
-        #endregion //StartTime
+    #region TimeInterval
 
-        #region TimeInterval
+    public static readonly DependencyProperty TimeIntervalProperty = DependencyProperty.Register( "TimeInterval", typeof( TimeSpan ), typeof( TimePicker ), new UIPropertyMetadata( TimeIntervalDefaultValue, OnTimeIntervalChanged ) );
+    public TimeSpan TimeInterval
+    {
+      get
+      {
+        return ( TimeSpan )GetValue( TimeIntervalProperty );
+      }
+      set
+      {
+        SetValue( TimeIntervalProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty TimeIntervalProperty = DependencyProperty.Register("TimeInterval", typeof(TimeSpan), typeof(TimePicker), new UIPropertyMetadata(TimeIntervalDefaultValue, OnTimeIntervalChanged));
-        public TimeSpan TimeInterval
-        {
-            get { return (TimeSpan)GetValue(TimeIntervalProperty); }
-            set { SetValue(TimeIntervalProperty, value); }
-        }
+    private static void OnTimeIntervalChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnTimeIntervalChanged( ( TimeSpan )e.OldValue, ( TimeSpan )e.NewValue );
+    }
 
-        private static void OnTimeIntervalChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            TimePicker timePicker = o as TimePicker;
-            if (timePicker != null)
-                timePicker.OnTimeIntervalChanged((TimeSpan)e.OldValue, (TimeSpan)e.NewValue);
-        }
+    protected virtual void OnTimeIntervalChanged( TimeSpan oldValue, TimeSpan newValue )
+    {
+      // TODO: Add your property changed side-effects. Descendants can override as well.
+    }
 
-        protected virtual void OnTimeIntervalChanged(TimeSpan oldValue, TimeSpan newValue)
-        {
-            // TODO: Add your property changed side-effects. Descendants can override as well.
-        }
+    #endregion //TimeInterval
 
-        #endregion //TimeInterval
+    #region Value
 
-        #region Value
+    public static readonly DependencyProperty ValueProperty = DependencyProperty.Register( "Value", typeof( DateTime? ), typeof( TimePicker ), new FrameworkPropertyMetadata( null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged ) );
+    public DateTime? Value
+    {
+      get
+      {
+        return ( DateTime? )GetValue( ValueProperty );
+      }
+      set
+      {
+        SetValue( ValueProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty ValueProperty = DependencyProperty.Register("Value", typeof(DateTime?), typeof(TimePicker), new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnValueChanged));
-        public DateTime? Value
-        {
-            get { return (DateTime?)GetValue(ValueProperty); }
-            set { SetValue(ValueProperty, value); }
-        }
+    private static void OnValueChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TimePicker timePicker = o as TimePicker;
+      if( timePicker != null )
+        timePicker.OnValueChanged( ( DateTime? )e.OldValue, ( DateTime? )e.NewValue );
+    }
 
-        private static void OnValueChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            TimePicker timePicker = o as TimePicker;
-            if (timePicker != null)
-                timePicker.OnValueChanged((DateTime?)e.OldValue, (DateTime?)e.NewValue);
-        }
+    protected virtual void OnValueChanged( DateTime? oldValue, DateTime? newValue )
+    {
+      //TODO: refactor this
+      if( newValue.HasValue && _timeListBox != null )
+      {
+        var items = _timeListBox.ItemsSource;
+        foreach( TimeItem item in items )
+        {
+          if( item.Time == newValue.Value.TimeOfDay )
+          {
+            int index = _timeListBox.Items.IndexOf( item );
+            if( _timeListBox.SelectedIndex != index )
+              _timeListBox.SelectedIndex = index;
+            break;
+          }
+        }
+      }
+
+      RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>( oldValue, newValue );
+      args.RoutedEvent = ValueChangedEvent;
+      RaiseEvent( args );
+    }
 
-        protected virtual void OnValueChanged(DateTime? oldValue, DateTime? newValue)
-        {
-            //TODO: refactor this
-            if (newValue.HasValue && _timeListBox != null)
-            {
-                var items = _timeListBox.ItemsSource;
-                foreach (TimeItem item in items)
-                {
-                    if (item.Time == newValue.Value.TimeOfDay)
-                    {
-                        int index = _timeListBox.Items.IndexOf(item);
-                        if (_timeListBox.SelectedIndex != index)
-                            _timeListBox.SelectedIndex = index;
-                        break;
-                    }
-                }
-            }
-
-            RoutedPropertyChangedEventArgs<object> args = new RoutedPropertyChangedEventArgs<object>(oldValue, newValue);
-            args.RoutedEvent = ValueChangedEvent;
-            RaiseEvent(args);
-        }
+    #endregion //Value
 
-        #endregion //Value
+    #region Watermark
 
-        #region Watermark
+    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( TimePicker ), new UIPropertyMetadata( null ) );
+    public object Watermark
+    {
+      get
+      {
+        return ( object )GetValue( WatermarkProperty );
+      }
+      set
+      {
+        SetValue( WatermarkProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register("Watermark", typeof(object), typeof(TimePicker), new UIPropertyMetadata(null));
-        public object Watermark
-        {
-            get { return (object)GetValue(WatermarkProperty); }
-            set { SetValue(WatermarkProperty, value); }
-        }
+    #endregion //Watermark
 
-        #endregion //Watermark
+    #region WatermarkTemplate
 
-        #region WatermarkTemplate
+    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( TimePicker ), new UIPropertyMetadata( null ) );
+    public DataTemplate WatermarkTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
+      }
+      set
+      {
+        SetValue( WatermarkTemplateProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register("WatermarkTemplate", typeof(DataTemplate), typeof(TimePicker), new UIPropertyMetadata(null));
-        public DataTemplate WatermarkTemplate
-        {
-            get { return (DataTemplate)GetValue(WatermarkTemplateProperty); }
-            set { SetValue(WatermarkTemplateProperty, value); }
-        }
+    #endregion //WatermarkTemplate
 
-        #endregion //WatermarkTemplate
+    #endregion //Properties
 
-        #endregion //Properties
+    #region Constructors
 
-        #region Constructors
+    static TimePicker()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( TimePicker ), new FrameworkPropertyMetadata( typeof( TimePicker ) ) );
+    }
 
-        static TimePicker()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(TimePicker), new FrameworkPropertyMetadata(typeof(TimePicker)));
-        }
+    public TimePicker()
+    {
+      DateTimeFormatInfo = DateTimeFormatInfo.GetInstance( CultureInfo.CurrentCulture );
+      Keyboard.AddKeyDownHandler( this, OnKeyDown );
+      Mouse.AddPreviewMouseDownOutsideCapturedElementHandler( this, OnMouseDownOutsideCapturedElement );
+    }
 
-        public TimePicker()
-        {
-            DateTimeFormatInfo = DateTimeFormatInfo.GetInstance(CultureInfo.CurrentCulture);
-            Keyboard.AddKeyDownHandler(this, OnKeyDown);
-            Mouse.AddPreviewMouseDownOutsideCapturedElementHandler(this, OnMouseDownOutsideCapturedElement);
-        }
+    #endregion //Constructors
 
-        #endregion //Constructors
+    #region Base Class Overrides
 
-        #region Base Class Overrides
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+      if( _timeListBox != null )
+        _timeListBox.SelectionChanged -= TimeListBox_SelectionChanged;
 
-            if (_timeListBox != null)
-                _timeListBox.SelectionChanged -= TimeListBox_SelectionChanged;
+      _timeListBox = GetTemplateChild( "PART_TimeListItems" ) as ListBox;
 
-            _timeListBox = GetTemplateChild("PART_TimeListItems") as ListBox;
+      if( _timeListBox != null )
+      {
+        _timeListBox.SelectionChanged += TimeListBox_SelectionChanged;
+        _timeListBox.ItemsSource = GenerateTimeListItemsSource();
+      }
+    }
 
-            if (_timeListBox != null)
-            {
-                _timeListBox.SelectionChanged += TimeListBox_SelectionChanged;
-                _timeListBox.ItemsSource = GenerateTimeListItemsSource();
-            }
-        }
+    #endregion //Base Class Overrides
 
-        #endregion //Base Class Overrides
+    #region Event Handlers
 
-        #region Event Handlers
+    private void OnKeyDown( object sender, KeyEventArgs e )
+    {
+      switch( e.Key )
+      {
+        case Key.Escape:
+        case Key.Tab:
+          {
+            CloseTimePicker();
+            break;
+          }
+      }
+    }
 
-        private void OnKeyDown(object sender, KeyEventArgs e)
-        {
-            switch (e.Key)
-            {
-                case Key.Escape:
-                case Key.Tab:
-                    {
-                        CloseTimePicker();
-                        break;
-                    }
-            }
-        }
+    private void OnMouseDownOutsideCapturedElement( object sender, MouseButtonEventArgs e )
+    {
+      CloseTimePicker();
+    }
 
-        private void OnMouseDownOutsideCapturedElement(object sender, MouseButtonEventArgs e)
-        {
-            CloseTimePicker();
-        }
+    void TimeListBox_SelectionChanged( object sender, SelectionChangedEventArgs e )
+    {
+      if( e.AddedItems.Count > 0 )
+      {
+        TimeItem selectedTimeListItem = ( TimeItem )e.AddedItems[ 0 ];
+        var time = selectedTimeListItem.Time;
+        ;
+        var date = Value ?? DateTime.MinValue;
 
-        void TimeListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            if (e.AddedItems.Count > 0)
-            {
-                TimeItem selectedTimeListItem = (TimeItem)e.AddedItems[0];
-                var time = selectedTimeListItem.Time; ;
-                var date = Value ?? DateTime.MinValue;
+        Value = new DateTime( date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds );
+      }
 
-                Value = new DateTime(date.Year, date.Month, date.Day, time.Hours, time.Minutes, time.Seconds, time.Milliseconds);
-            }
+      CloseTimePicker();
+    }
 
-            CloseTimePicker();
-        }
+    #endregion //Event Handlers
 
-        #endregion //Event Handlers
+    #region Events
 
-        #region Events
+    //Due to a bug in Visual Studio, you cannot create event handlers for nullable args in XAML, so I have to use object instead.
+    public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent( "ValueChanged", RoutingStrategy.Bubble, typeof( RoutedPropertyChangedEventHandler<object> ), typeof( TimePicker ) );
+    public event RoutedPropertyChangedEventHandler<object> ValueChanged
+    {
+      add
+      {
+        AddHandler( ValueChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( ValueChangedEvent, value );
+      }
+    }
 
-        //Due to a bug in Visual Studio, you cannot create event handlers for nullable args in XAML, so I have to use object instead.
-        public static readonly RoutedEvent ValueChangedEvent = EventManager.RegisterRoutedEvent("ValueChanged", RoutingStrategy.Bubble, typeof(RoutedPropertyChangedEventHandler<object>), typeof(TimePicker));
-        public event RoutedPropertyChangedEventHandler<object> ValueChanged
-        {
-            add { AddHandler(ValueChangedEvent, value); }
-            remove { RemoveHandler(ValueChangedEvent, value); }
-        }
+    #endregion //Events
+
+    #region Methods
 
-        #endregion //Events
+    private void CloseTimePicker()
+    {
+      if( IsOpen )
+        IsOpen = false;
+      ReleaseMouseCapture();
+    }
 
-        #region Methods
+    public IEnumerable GenerateTimeListItemsSource()
+    {
+      TimeSpan time = StartTime;
+      TimeSpan endTime = EndTime;
 
-        private void CloseTimePicker()
-        {
-            if (IsOpen)
-                IsOpen = false;
-            ReleaseMouseCapture();
-        }
+      if( endTime <= time )
+      {
+        endTime = EndTimeDefaultValue;
+        time = StartTimeDefaultValue;
+      }
 
-        public IEnumerable GenerateTimeListItemsSource()
-        {
-            TimeSpan time = StartTime;
-            TimeSpan endTime = EndTime;
-
-            if (endTime <= time)
-            {
-                endTime = EndTimeDefaultValue;
-                time = StartTimeDefaultValue;
-            }
-
-            TimeSpan timeInterval = TimeInterval;
-
-            if (time != null && endTime != null && timeInterval != null && timeInterval.Ticks > 0)
-            {
-                while (time <= endTime)
-                {
-                    yield return new TimeItem(DateTime.MinValue.Add(time).ToString(GetTimeFormat(), CultureInfo.CurrentCulture), time);
-                    time = time.Add(timeInterval);
-                }
-                yield break;
-            }
-        }
+      TimeSpan timeInterval = TimeInterval;
 
-        private string GetTimeFormat()
+      if( time != null && endTime != null && timeInterval != null && timeInterval.Ticks > 0 )
+      {
+        while( time <= endTime )
         {
-            switch (Format)
-            {
-                case TimeFormat.Custom:
-                    return FormatString;
-                case TimeFormat.LongTime:
-                    return DateTimeFormatInfo.LongTimePattern;
-                case TimeFormat.ShortTime:
-                    return DateTimeFormatInfo.ShortTimePattern;
-                default:
-                    return DateTimeFormatInfo.ShortTimePattern;
-            }
+          yield return new TimeItem( DateTime.MinValue.Add( time ).ToString( GetTimeFormat(), CultureInfo.CurrentCulture ), time );
+          time = time.Add( timeInterval );
         }
+        yield break;
+      }
+    }
 
-        #endregion //Methods
+    private string GetTimeFormat()
+    {
+      switch( Format )
+      {
+        case TimeFormat.Custom:
+          return FormatString;
+        case TimeFormat.LongTime:
+          return DateTimeFormatInfo.LongTimePattern;
+        case TimeFormat.ShortTime:
+          return DateTimeFormatInfo.ShortTimePattern;
+        default:
+          return DateTimeFormatInfo.ShortTimePattern;
+      }
     }
+
+    #endregion //Methods
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
index dde6c1da..c7e8e6b2 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
@@ -1,137 +1,160 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <!-- =============================================================================== -->
-    <!-- ResourceDictionary for TimePicker and related controls                          -->
-    <!-- =============================================================================== -->
-
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-    <coreConverters:TimeFormatToDateTimeFormatConverter x:Key="TimeFormatToDateTimeFormatConverter" />
-
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
-    </DataTemplate>
-    
-    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <Style x:Key="TimePickerToggleButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Grid SnapsToDevicePixels="True">
-                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                             CornerRadius="0,2.75,2.75,0"
-                                             RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
-                                             RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
-											 RenderMouseOver="{TemplateBinding IsMouseOver}"
-											 RenderPressed="{TemplateBinding IsPressed}" >
-
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-
-                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
-                                    <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                </Grid>
-                            </Grid>
-                        </chrome:ButtonChrome>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <SolidColorBrush x:Key="ListItemHover" Color="#FFE7F5FD"/>
-    
-    <Style x:Key="TimeItemStyle" TargetType="ListBoxItem">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ListBoxItem">
-                    <Border Name="Border" SnapsToDevicePixels="true">                        
-                            <ContentPresenter Margin="4" />                        
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{StaticResource ListItemHover}" />
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                            <Setter Property="Foreground" Value="White" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- =============================================================================== -->
-    <!-- TimePicker                                                                      -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:TimePicker}">
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:TimePicker}">
-                    <Border>
-                        <Grid>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <local:DateTimeUpDown x:Name="PART_TimeUpDown" 
-                                                      BorderThickness="1,1,0,1"  
-                                                      Background="{TemplateBinding Background}"
-                                                      Foreground="{TemplateBinding Foreground}"
-                                                      ContextMenu="{TemplateBinding ContextMenu}"
-                                                      AllowSpin="{TemplateBinding AllowSpin}"
-                                                      Format="{TemplateBinding Format, Converter={StaticResource TimeFormatToDateTimeFormatConverter}}"
-                                                      FormatString="{TemplateBinding FormatString}"
-                                                      ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
-                                                      Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
-                                                      Watermark="{TemplateBinding Watermark}"
-                                                      WatermarkTemplate="{TemplateBinding WatermarkTemplate}"/>
-                                <ToggleButton x:Name="_timePickerToggleButton" Grid.Column="1"
-                                              IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                                              Style="{StaticResource TimePickerToggleButtonStyle}"
-                                              IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"/>
-                            </Grid>
-                            <Popup IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}" StaysOpen="False">
-                                <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" >
-                                    <Grid>
-                                        <ListBox x:Name="PART_TimeListItems" BorderThickness="0" Width="150" Height="130"
-                                                 DisplayMemberPath="Display"
-                                                 ItemContainerStyle="{StaticResource TimeItemStyle}"/>
-                                    </Grid>
-                                </Border>
-                            </Popup>
+   <!-- =============================================================================== -->
+   <!-- ResourceDictionary for TimePicker and related controls                          -->
+   <!-- =============================================================================== -->
+
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <coreConverters:TimeFormatToDateTimeFormatConverter x:Key="TimeFormatToDateTimeFormatConverter" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="TimePickerToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0,2.75,2.75,0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderPressed="{TemplateBinding IsPressed}">
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
                         </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                     </Grid>
+                  </chrome:ButtonChrome>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <SolidColorBrush x:Key="ListItemHover" Color="#FFE7F5FD" />
+
+   <Style x:Key="TimeItemStyle" TargetType="ListBoxItem">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ListBoxItem">
+               <Border Name="Border" SnapsToDevicePixels="true">
+                  <ContentPresenter Margin="4" />
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="Border" Property="Background" Value="{StaticResource ListItemHover}" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="Border" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                     <Setter Property="Foreground" Value="White" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- TimePicker                                                                      -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:TimePicker}">
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:TimePicker}">
+               <Border>
+                  <Grid>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <local:DateTimeUpDown x:Name="PART_TimeUpDown" 
+                                              BorderThickness="1,1,0,1"
+                                              Background="{TemplateBinding Background}"
+                                              Foreground="{TemplateBinding Foreground}"
+                                              ContextMenu="{TemplateBinding ContextMenu}"
+                                              AllowSpin="{TemplateBinding AllowSpin}"
+                                              Format="{TemplateBinding Format, Converter={StaticResource TimeFormatToDateTimeFormatConverter}}"
+                                              FormatString="{TemplateBinding FormatString}"
+                                              ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
+                                              Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                              Watermark="{TemplateBinding Watermark}"
+                                              WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                        <ToggleButton x:Name="_timePickerToggleButton"
+                                      Grid.Column="1"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource TimePickerToggleButtonStyle}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                     </Grid>
+                     <Popup IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}"
+                            StaysOpen="False">
+                        <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                           <Grid>
+                              <ListBox x:Name="PART_TimeListItems"
+                                       BorderThickness="0"
+                                       Width="150"
+                                       Height="130"
+                                       DisplayMemberPath="Display"
+                                       ItemContainerStyle="{StaticResource TimeItemStyle}" />
+                           </Grid>
+                        </Border>
+                     </Popup>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/Token.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/Token.cs
index 53d69025..2252ec36 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/Token.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/Token.cs
@@ -1,23 +1,54 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System;
-using System.Linq;
 
 namespace Microsoft.Windows.Controls
 {
-    internal class Token
+  internal class Token
+  {
+    public string Delimiter
+    {
+      get;
+      private set;
+    }
+    public object Item
+    {
+      get;
+      set;
+    }
+
+    private string _tokenKey;
+    public string TokenKey
+    {
+      get
+      {
+        return _tokenKey;
+      }
+      set
+      {
+        _tokenKey = String.Format( "{0}{1}", value, Delimiter );
+      }
+    }
+
+    public Token( string delimiter )
     {
-        public string Delimiter { get; private set; }
-        public object Item { get; set; }
-
-        private string _tokenKey;
-        public string TokenKey
-        {
-            get { return _tokenKey; }
-            set { _tokenKey = String.Format("{0}{1}", value, Delimiter); }
-        }
-
-        public Token(string delimiter)
-        {
-            Delimiter = delimiter;
-        }
+      Delimiter = delimiter;
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenItem.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenItem.cs
index 1e48a151..2c8bb020 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenItem.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenItem.cs
@@ -1,20 +1,44 @@
-using System.Windows;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Windows;
 using System.Windows.Controls;
 
 namespace Microsoft.Windows.Controls
 {
-    public class TokenItem : ContentControl
+  public class TokenItem : ContentControl
+  {
+    static TokenItem()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( TokenItem ), new FrameworkPropertyMetadata( typeof( TokenItem ) ) );
+    }
+
+    public static readonly DependencyProperty TokenKeyProperty = DependencyProperty.Register( "TokenKey", typeof( string ), typeof( TokenItem ), new UIPropertyMetadata( null ) );
+    public string TokenKey
     {
-        static TokenItem()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(TokenItem), new FrameworkPropertyMetadata(typeof(TokenItem)));
-        }
-
-        public static readonly DependencyProperty TokenKeyProperty = DependencyProperty.Register("TokenKey", typeof(string), typeof(TokenItem), new UIPropertyMetadata(null));
-        public string TokenKey
-        {
-            get { return (string)GetValue(TokenKeyProperty); }
-            set { SetValue(TokenKeyProperty, value); }
-        }
+      get
+      {
+        return ( string )GetValue( TokenKeyProperty );
+      }
+      set
+      {
+        SetValue( TokenKeyProperty, value );
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBox.cs
index 0918f245..2267e42a 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBox.cs
@@ -1,4 +1,22 @@
-//Based of the code written by Pavan Podila
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+//Based of the code written by Pavan Podila
 //http://blog.pixelingene.com/2010/10/tokenizing-control-convert-text-to-tokens/
 using System;
 using System.Linq;
@@ -9,333 +27,366 @@ using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls
 {
-    public class TokenizedTextBox : ItemsControl
-    {
-        #region Members
+  public class TokenizedTextBox : ItemsControl
+  {
+    #region Members
 
-        private System.Windows.Controls.RichTextBox _rtb = null;
-        private bool _surpressTextChanged = false;
-        private bool _surpressTextChangedEvent = false;
+    private System.Windows.Controls.RichTextBox _rtb = null;
+    private bool _surpressTextChanged = false;
+    private bool _surpressTextChangedEvent = false;
 
-        #endregion //Members
+    #endregion //Members
 
-        #region Properties
+    #region Properties
 
-        public static readonly DependencyProperty SearchMemberPathProperty = DependencyProperty.Register("SearchMemberPath", typeof(string), typeof(TokenizedTextBox), new UIPropertyMetadata(String.Empty));
-        public string SearchMemberPath
-        {
-            get { return (string)GetValue(SearchMemberPathProperty); }
-            set { SetValue(SearchMemberPathProperty, value); }
-        }
-
-        public static readonly DependencyProperty TokenDelimiterProperty = DependencyProperty.Register("TokenDelimiter", typeof(string), typeof(TokenizedTextBox), new UIPropertyMetadata(";"));
-        public string TokenDelimiter
-        {
-            get { return (string)GetValue(TokenDelimiterProperty); }
-            set { SetValue(TokenDelimiterProperty, value); }
-        }
+    public static readonly DependencyProperty SearchMemberPathProperty = DependencyProperty.Register( "SearchMemberPath", typeof( string ), typeof( TokenizedTextBox ), new UIPropertyMetadata( String.Empty ) );
+    public string SearchMemberPath
+    {
+      get
+      {
+        return ( string )GetValue( SearchMemberPathProperty );
+      }
+      set
+      {
+        SetValue( SearchMemberPathProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty TokenTemplateProperty = DependencyProperty.Register("TokenTemplate", typeof(DataTemplate), typeof(TokenizedTextBox), new UIPropertyMetadata(null));
-        public DataTemplate TokenTemplate
-        {
-            get { return (DataTemplate)GetValue(TokenTemplateProperty); }
-            set { SetValue(TokenTemplateProperty, value); }
-        }
+    public static readonly DependencyProperty TokenDelimiterProperty = DependencyProperty.Register( "TokenDelimiter", typeof( string ), typeof( TokenizedTextBox ), new UIPropertyMetadata( ";" ) );
+    public string TokenDelimiter
+    {
+      get
+      {
+        return ( string )GetValue( TokenDelimiterProperty );
+      }
+      set
+      {
+        SetValue( TokenDelimiterProperty, value );
+      }
+    }
 
-        #region Text
+    public static readonly DependencyProperty TokenTemplateProperty = DependencyProperty.Register( "TokenTemplate", typeof( DataTemplate ), typeof( TokenizedTextBox ), new UIPropertyMetadata( null ) );
+    public DataTemplate TokenTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( TokenTemplateProperty );
+      }
+      set
+      {
+        SetValue( TokenTemplateProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register("Text", typeof(string), typeof(TokenizedTextBox), new UIPropertyMetadata(null, OnTextChanged));
-        public string Text
-        {
-            get { return (string)GetValue(TextProperty); }
-            set { SetValue(TextProperty, value); }
-        }
+    #region Text
 
-        private static void OnTextChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            TokenizedTextBox tokenizedTextBox = o as TokenizedTextBox;
-            if (tokenizedTextBox != null)
-                tokenizedTextBox.OnTextChanged((string)e.OldValue, (string)e.NewValue);
-        }
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register( "Text", typeof( string ), typeof( TokenizedTextBox ), new UIPropertyMetadata( null, OnTextChanged ) );
+    public string Text
+    {
+      get
+      {
+        return ( string )GetValue( TextProperty );
+      }
+      set
+      {
+        SetValue( TextProperty, value );
+      }
+    }
 
-        protected virtual void OnTextChanged(string oldValue, string newValue)
-        {
-            if (_rtb == null || _surpressTextChanged)
-                return;
+    private static void OnTextChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      TokenizedTextBox tokenizedTextBox = o as TokenizedTextBox;
+      if( tokenizedTextBox != null )
+        tokenizedTextBox.OnTextChanged( ( string )e.OldValue, ( string )e.NewValue );
+    }
 
-            //TODO: when text changes update tokens
-        }
+    protected virtual void OnTextChanged( string oldValue, string newValue )
+    {
+      if( _rtb == null || _surpressTextChanged )
+        return;
 
-        #endregion //Text
+      //TODO: when text changes update tokens
+    }
 
-        public static readonly DependencyProperty ValueMemberPathProperty = DependencyProperty.Register("ValueMemberPath", typeof(string), typeof(TokenizedTextBox), new UIPropertyMetadata(String.Empty));
-        public string ValueMemberPath
-        {
-            get { return (string)GetValue(ValueMemberPathProperty); }
-            set { SetValue(ValueMemberPathProperty, value); }
-        }
+    #endregion //Text
 
+    public static readonly DependencyProperty ValueMemberPathProperty = DependencyProperty.Register( "ValueMemberPath", typeof( string ), typeof( TokenizedTextBox ), new UIPropertyMetadata( String.Empty ) );
+    public string ValueMemberPath
+    {
+      get
+      {
+        return ( string )GetValue( ValueMemberPathProperty );
+      }
+      set
+      {
+        SetValue( ValueMemberPathProperty, value );
+      }
+    }
 
-        #endregion //Properties
 
-        #region Constructors
+    #endregion //Properties
 
-        static TokenizedTextBox()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(TokenizedTextBox), new FrameworkPropertyMetadata(typeof(TokenizedTextBox)));
-        }
+    #region Constructors
 
-        public TokenizedTextBox()
-        {
-            CommandBindings.Add(new CommandBinding(TokenizedTextBoxCommands.Delete, DeleteToken));
-        }
+    static TokenizedTextBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( TokenizedTextBox ), new FrameworkPropertyMetadata( typeof( TokenizedTextBox ) ) );
+    }
 
-        #endregion //Constructors
+    public TokenizedTextBox()
+    {
+      CommandBindings.Add( new CommandBinding( TokenizedTextBoxCommands.Delete, DeleteToken ) );
+    }
 
-        #region Base Class Overrides
+    #endregion //Constructors
 
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
+    #region Base Class Overrides
 
-            if (_rtb != null)
-            {
-                _rtb.TextChanged -= RichTextBox_TextChanged;
-                _rtb.PreviewKeyDown -= RichTextBox_PreviewKeyDown;
-            }
-            _rtb = GetTemplateChild("PART_ContentHost") as System.Windows.Controls.RichTextBox;
-            if (_rtb != null)
-            {
-                _rtb.TextChanged += RichTextBox_TextChanged;
-                _rtb.PreviewKeyDown += RichTextBox_PreviewKeyDown;
-            }
+    public override void OnApplyTemplate()
+    {
+      base.OnApplyTemplate();
+
+      if( _rtb != null )
+      {
+        _rtb.TextChanged -= RichTextBox_TextChanged;
+        _rtb.PreviewKeyDown -= RichTextBox_PreviewKeyDown;
+      }
+      _rtb = GetTemplateChild( "PART_ContentHost" ) as System.Windows.Controls.RichTextBox;
+      if( _rtb != null )
+      {
+        _rtb.TextChanged += RichTextBox_TextChanged;
+        _rtb.PreviewKeyDown += RichTextBox_PreviewKeyDown;
+      }
+
+      InitializeTokensFromText();
+    }
 
-            InitializeTokensFromText();
-        }
+    #endregion //Base Class Overrides
 
-        #endregion //Base Class Overrides
+    #region Event Handlers
 
-        #region Event Handlers
+    private void RichTextBox_TextChanged( object sender, TextChangedEventArgs e )
+    {
+      if( _surpressTextChangedEvent )
+        return;
+
+      var text = _rtb.CaretPosition.GetTextInRun( LogicalDirection.Backward );
+      var token = ResolveToken( text );
+      if( token != null )
+      {
+        ReplaceTextWithToken( text.Trim(), token );
+      }
+    }
 
-        private void RichTextBox_TextChanged(object sender, TextChangedEventArgs e)
+    void RichTextBox_PreviewKeyDown( object sender, KeyEventArgs e )
+    {
+      InlineUIContainer container = null;
+
+      if( e.Key == Key.Back )
+      {
+        container = _rtb.CaretPosition.GetAdjacentElement( LogicalDirection.Backward ) as InlineUIContainer;
+      }
+      else if( e.Key == Key.Delete )
+      {
+        //if the selected text is a blank space, I will assume that a token item is selected.
+        //if a token item is selected, we need to move the caret position to the left of the element so we can grab the InlineUIContainer
+        if( _rtb.Selection.Text == " " )
         {
-            if (_surpressTextChangedEvent)
-                return;
-
-            var text = _rtb.CaretPosition.GetTextInRun(LogicalDirection.Backward);
-            var token = ResolveToken(text);
-            if (token != null)
-            {
-                ReplaceTextWithToken(text.Trim(), token);
-            }
+          TextPointer moveTo = _rtb.CaretPosition.GetNextInsertionPosition( LogicalDirection.Backward );
+          _rtb.CaretPosition = moveTo;
         }
 
-        void RichTextBox_PreviewKeyDown(object sender, KeyEventArgs e)
-        {
-            InlineUIContainer container = null;
-
-            if (e.Key == Key.Back)
-            {
-                container = _rtb.CaretPosition.GetAdjacentElement(LogicalDirection.Backward) as InlineUIContainer;
-            }
-            else if (e.Key == Key.Delete)
-            {
-                //if the selected text is a blank space, I will assume that a token item is selected.
-                //if a token item is selected, we need to move the caret position to the left of the element so we can grab the InlineUIContainer
-                if (_rtb.Selection.Text == " ")
-                {
-                    TextPointer moveTo = _rtb.CaretPosition.GetNextInsertionPosition(LogicalDirection.Backward);
-                    _rtb.CaretPosition = moveTo;
-                }
-
-                //the cursor is to the left of a token item
-                container = _rtb.CaretPosition.GetAdjacentElement(LogicalDirection.Forward) as InlineUIContainer;
-            }
+        //the cursor is to the left of a token item
+        container = _rtb.CaretPosition.GetAdjacentElement( LogicalDirection.Forward ) as InlineUIContainer;
+      }
 
-            //if the container is not null that means we have something to delete
-            if (container != null)
-            {
-                var token = (container as InlineUIContainer).Child as TokenItem;
-                if (token != null)
-                {
-                    SetTextInternal(Text.Replace(token.TokenKey, ""));
-                }
-            }
+      //if the container is not null that means we have something to delete
+      if( container != null )
+      {
+        var token = ( container as InlineUIContainer ).Child as TokenItem;
+        if( token != null )
+        {
+          SetTextInternal( Text.Replace( token.TokenKey, "" ) );
         }
+      }
+    }
 
-        #endregion //Event Handlers
+    #endregion //Event Handlers
 
-        #region Methods
+    #region Methods
 
-        private void InitializeTokensFromText()
+    private void InitializeTokensFromText()
+    {
+      if( !String.IsNullOrEmpty( Text ) )
+      {
+        string[] tokenKeys = Text.Split( new string[] { TokenDelimiter }, StringSplitOptions.RemoveEmptyEntries );
+        foreach( string tokenKey in tokenKeys )
         {
-            if (!String.IsNullOrEmpty(Text))
-            {
-                string[] tokenKeys = Text.Split(new string[] { TokenDelimiter }, StringSplitOptions.RemoveEmptyEntries);
-                foreach (string tokenKey in tokenKeys)
-                {
-                    var para = _rtb.CaretPosition.Paragraph;
-                    var token = new Token(TokenDelimiter)
-                    {
-                        TokenKey = tokenKey,
-                        Item = ResolveItemByTokenKey(tokenKey)
-                    };
-                    para.Inlines.Add(CreateTokenContainer(token));
-                }
-            }
+          var para = _rtb.CaretPosition.Paragraph;
+          var token = new Token( TokenDelimiter )
+          {
+            TokenKey = tokenKey,
+            Item = ResolveItemByTokenKey( tokenKey )
+          };
+          para.Inlines.Add( CreateTokenContainer( token ) );
         }
+      }
+    }
 
-        private Token ResolveToken(string text)
-        {
-            if (text.EndsWith(TokenDelimiter))
-                return ResolveTokenBySearchMemberPath(text.Substring(0, text.Length - 1).Trim());
+    private Token ResolveToken( string text )
+    {
+      if( text.EndsWith( TokenDelimiter ) )
+        return ResolveTokenBySearchMemberPath( text.Substring( 0, text.Length - 1 ).Trim() );
 
-            return null;
-        }
+      return null;
+    }
 
-        private Token ResolveTokenBySearchMemberPath(string searchText)
+    private Token ResolveTokenBySearchMemberPath( string searchText )
+    {
+      //create a new token and default the settings to the search text
+      var token = new Token( TokenDelimiter )
+      {
+        TokenKey = searchText,
+        Item = searchText
+      };
+
+      if( ItemsSource != null )
+      {
+        foreach( object item in ItemsSource )
         {
-            //create a new token and default the settings to the search text
-            var token = new Token(TokenDelimiter)
+          var searchProperty = item.GetType().GetProperty( SearchMemberPath );
+          if( searchProperty != null )
+          {
+            var searchValue = searchProperty.GetValue( item, null );
+            if( searchText.Equals( searchValue.ToString(), StringComparison.InvariantCultureIgnoreCase ) )
             {
-                TokenKey = searchText,
-                Item = searchText
-            };
+              var valueProperty = item.GetType().GetProperty( ValueMemberPath );
+              if( valueProperty != null )
+                token.TokenKey = valueProperty.GetValue( item, null ).ToString();
 
-            if (ItemsSource != null)
-            {
-                foreach (object item in ItemsSource)
-                {
-                    var searchProperty = item.GetType().GetProperty(SearchMemberPath);
-                    if (searchProperty != null)
-                    {
-                        var searchValue = searchProperty.GetValue(item, null);
-                        if (searchText.Equals(searchValue.ToString(), StringComparison.InvariantCultureIgnoreCase))
-                        {
-                            var valueProperty = item.GetType().GetProperty(ValueMemberPath);
-                            if (valueProperty != null)
-                                token.TokenKey = valueProperty.GetValue(item, null).ToString();
-
-                            token.Item = item;
-                            break;
-                        }
-                    }
-                }
+              token.Item = item;
+              break;
             }
-
-            return token;
+          }
         }
+      }
 
-        private object ResolveItemByTokenKey(string tokenKey)
-        {
-            if (ItemsSource != null)
-            {
-                foreach (object item in ItemsSource)
-                {
-                    var property = item.GetType().GetProperty(ValueMemberPath);
-                    if (property != null)
-                    {
-                        var value = property.GetValue(item, null);
-                        if (tokenKey.Equals(value.ToString(), StringComparison.InvariantCultureIgnoreCase))
-                            return item;
-                    }
-                }
-            }
+      return token;
+    }
 
-            return tokenKey;
+    private object ResolveItemByTokenKey( string tokenKey )
+    {
+      if( ItemsSource != null )
+      {
+        foreach( object item in ItemsSource )
+        {
+          var property = item.GetType().GetProperty( ValueMemberPath );
+          if( property != null )
+          {
+            var value = property.GetValue( item, null );
+            if( tokenKey.Equals( value.ToString(), StringComparison.InvariantCultureIgnoreCase ) )
+              return item;
+          }
         }
+      }
 
-        private void ReplaceTextWithToken(string inputText, Token token)
-        {
-            _surpressTextChangedEvent = true;
+      return tokenKey;
+    }
 
-            var para = _rtb.CaretPosition.Paragraph;
+    private void ReplaceTextWithToken( string inputText, Token token )
+    {
+      _surpressTextChangedEvent = true;
 
-            var matchedRun = para.Inlines.FirstOrDefault(inline =>
-            {
-                var run = inline as Run;
-                return (run != null && run.Text.EndsWith(inputText));
-            }) as Run;
+      var para = _rtb.CaretPosition.Paragraph;
 
-            if (matchedRun != null) // Found a Run that matched the inputText
-            {
-                var tokenContainer = CreateTokenContainer(token);
-                para.Inlines.InsertBefore(matchedRun, tokenContainer);
-
-                // Remove only if the Text in the Run is the same as inputText, else split up
-                if (matchedRun.Text == inputText)
-                {
-                    para.Inlines.Remove(matchedRun);
-                }
-                else // Split up
-                {
-                    var index = matchedRun.Text.IndexOf(inputText) + inputText.Length;
-                    var tailEnd = new Run(matchedRun.Text.Substring(index));
-                    para.Inlines.InsertAfter(matchedRun, tailEnd);
-                    para.Inlines.Remove(matchedRun);
-                }
-
-                //now append the Text with the token key
-                SetTextInternal(Text + token.TokenKey);
-            }
+      var matchedRun = para.Inlines.FirstOrDefault( inline =>
+      {
+        var run = inline as Run;
+        return ( run != null && run.Text.EndsWith( inputText ) );
+      } ) as Run;
 
-            _surpressTextChangedEvent = false;
-        }
+      if( matchedRun != null ) // Found a Run that matched the inputText
+      {
+        var tokenContainer = CreateTokenContainer( token );
+        para.Inlines.InsertBefore( matchedRun, tokenContainer );
 
-        private InlineUIContainer CreateTokenContainer(Token token)
+        // Remove only if the Text in the Run is the same as inputText, else split up
+        if( matchedRun.Text == inputText )
         {
-            return new InlineUIContainer(CreateTokenItem(token)) { BaselineAlignment = BaselineAlignment.Center };
+          para.Inlines.Remove( matchedRun );
         }
-
-        private TokenItem CreateTokenItem(Token token)
+        else // Split up
         {
-            object item = token.Item;
+          var index = matchedRun.Text.IndexOf( inputText ) + inputText.Length;
+          var tailEnd = new Run( matchedRun.Text.Substring( index ) );
+          para.Inlines.InsertAfter( matchedRun, tailEnd );
+          para.Inlines.Remove( matchedRun );
+        }
 
-            var tokenItem = new TokenItem()
-            {
-                TokenKey = token.TokenKey,
-                Content = item,
-                ContentTemplate = TokenTemplate
-            };
+        //now append the Text with the token key
+        SetTextInternal( Text + token.TokenKey );
+      }
 
-            if (TokenTemplate == null)
-            {
-                //if no template was supplied let's try to get a value from the object using the DisplayMemberPath
-                if (!String.IsNullOrEmpty(DisplayMemberPath))
-                {
-                    var property = item.GetType().GetProperty(DisplayMemberPath);
-                    if (property != null)
-                    {
-                        var value = property.GetValue(item, null);
-                        if (value != null)
-                            tokenItem.Content = value;
-                    }
-                }
-            }
+      _surpressTextChangedEvent = false;
+    }
 
-            return tokenItem;
-        }
+    private InlineUIContainer CreateTokenContainer( Token token )
+    {
+      return new InlineUIContainer( CreateTokenItem( token ) )
+      {
+        BaselineAlignment = BaselineAlignment.Center
+      };
+    }
 
-        private void DeleteToken(object sender, ExecutedRoutedEventArgs e)
+    private TokenItem CreateTokenItem( Token token )
+    {
+      object item = token.Item;
+
+      var tokenItem = new TokenItem()
+      {
+        TokenKey = token.TokenKey,
+        Content = item,
+        ContentTemplate = TokenTemplate
+      };
+
+      if( TokenTemplate == null )
+      {
+        //if no template was supplied let's try to get a value from the object using the DisplayMemberPath
+        if( !String.IsNullOrEmpty( DisplayMemberPath ) )
         {
-            var para = _rtb.CaretPosition.Paragraph;
+          var property = item.GetType().GetProperty( DisplayMemberPath );
+          if( property != null )
+          {
+            var value = property.GetValue( item, null );
+            if( value != null )
+              tokenItem.Content = value;
+          }
+        }
+      }
+
+      return tokenItem;
+    }
 
-            Inline inlineToRemove = para.Inlines.Where(inline => inline is InlineUIContainer && ((inline as InlineUIContainer).Child as TokenItem).TokenKey.Equals(e.Parameter)).FirstOrDefault();
+    private void DeleteToken( object sender, ExecutedRoutedEventArgs e )
+    {
+      var para = _rtb.CaretPosition.Paragraph;
 
-            if (inlineToRemove != null)
-                para.Inlines.Remove(inlineToRemove);
+      Inline inlineToRemove = para.Inlines.Where( inline => inline is InlineUIContainer && ( ( inline as InlineUIContainer ).Child as TokenItem ).TokenKey.Equals( e.Parameter ) ).FirstOrDefault();
 
-            //update Text to remove delimited value
-            SetTextInternal(Text.Replace(e.Parameter.ToString(), ""));
-        }
+      if( inlineToRemove != null )
+        para.Inlines.Remove( inlineToRemove );
 
-        private void SetTextInternal(string text)
-        {
-            _surpressTextChanged = true;
-            Text = text;
-            _surpressTextChanged = false;
-        }
+      //update Text to remove delimited value
+      SetTextInternal( Text.Replace( e.Parameter.ToString(), "" ) );
+    }
 
-        #endregion //Methods
+    private void SetTextInternal( string text )
+    {
+      _surpressTextChanged = true;
+      Text = text;
+      _surpressTextChanged = false;
     }
+
+    #endregion //Methods
+  }
 }
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBoxCommands.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBoxCommands.cs
index 89e05c5f..494eac55 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBoxCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Implementation/TokenizedTextBoxCommands.cs
@@ -1,14 +1,35 @@
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls
 {
-    public static class TokenizedTextBoxCommands
-    {
+  public static class TokenizedTextBoxCommands
+  {
+    private static RoutedCommand _deleteCommand = new RoutedCommand();
 
-        private static RoutedCommand _deleteCommand = new RoutedCommand();
-        public static RoutedCommand Delete
-        {
-            get { return _deleteCommand; }
-        }
+    public static RoutedCommand Delete
+    {
+      get
+      {
+        return _deleteCommand;
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml
index ee422d5b..aee352a4 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml
@@ -1,59 +1,78 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Microsoft.Windows.Controls" >
-
-    <Style TargetType="{x:Type local:TokenItem}">
-        <Setter Property="Background" Value="#F3F7FD" />
-        <Setter Property="BorderBrush" Value="#BBD8FB" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Cursor" Value="Arrow" />
-        <Setter Property="Padding" Value="5,1,5,1" />
-        <Setter Property="Margin" Value="1,0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:TokenItem}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Padding="{TemplateBinding Padding}"
-                            Margin="{TemplateBinding Margin}">
-                        <StackPanel Orientation="Horizontal" Margin="1">
-                            <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" />
-                            <Button Margin="3,0,0,0" Cursor="Hand" Command="local:TokenizedTextBoxCommands.Delete" CommandParameter="{TemplateBinding TokenKey}"  >
-                                <Button.Template>
-                                    <ControlTemplate TargetType="Button">
-                                        <ContentPresenter />
-                                    </ControlTemplate>
-                                </Button.Template>
-                                <Image Source="/WPFToolkit.Extended;component/TokenizedTextBox/Images/delete8.png" Width="8" Height="8" />
-                            </Button>
-                        </StackPanel>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type local:TokenizedTextBox}" >
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:TokenizedTextBox}">
-                    <Border x:Name="Bd" Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <RichTextBox x:Name="PART_ContentHost" AcceptsReturn="False" IsDocumentEnabled="True" Padding="-3,0,0,0"  />
-                            <!--<Popup>
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls">
+
+   <Style TargetType="{x:Type local:TokenItem}">
+      <Setter Property="Background" Value="#F3F7FD" />
+      <Setter Property="BorderBrush" Value="#BBD8FB" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Cursor" Value="Arrow" />
+      <Setter Property="Padding" Value="5,1,5,1" />
+      <Setter Property="Margin" Value="1,0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:TokenItem}">
+               <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       Padding="{TemplateBinding Padding}"
+                       Margin="{TemplateBinding Margin}">
+                  <StackPanel Orientation="Horizontal" Margin="1">
+                     <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" />
+                     <Button Margin="3,0,0,0" Cursor="Hand" Command="local:TokenizedTextBoxCommands.Delete" CommandParameter="{TemplateBinding TokenKey}">
+                        <Button.Template>
+                           <ControlTemplate TargetType="Button">
+                              <ContentPresenter />
+                           </ControlTemplate>
+                        </Button.Template>
+                        <Image Source="/WPFToolkit.Extended;component/TokenizedTextBox/Images/delete8.png" Width="8" Height="8" />
+                     </Button>
+                  </StackPanel>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:TokenizedTextBox}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:TokenizedTextBox}">
+               <Border x:Name="Bd"
+                       Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <RichTextBox x:Name="PART_ContentHost" AcceptsReturn="False" IsDocumentEnabled="True" Padding="-3,0,0,0" />
+                     <!--<Popup>
                                 <Grid Background="White">
                                     <ItemsPresenter />
                                 </Grid>
                             </Popup>-->
-                        </Grid>
-                    </Border>
+                  </Grid>
+               </Border>
 
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/VisualStates.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/VisualStates.cs
index 721a96e2..dad6f3d9 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/VisualStates.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/VisualStates.cs
@@ -1,9 +1,26 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls
 {
-    internal static partial class VisualStates
-    {
+  internal static partial class VisualStates
+  {
 
-    }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs
index ea3e19a8..ca1af2ad 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Implementation/WatermarkTextBox.cs
@@ -1,79 +1,114 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls
 {
-    public class WatermarkTextBox : TextBox
-    {
-        #region Properties
-
-        #region SelectAllOnGotFocus
+  public class WatermarkTextBox : TextBox
+  {
+    #region Properties
 
-        public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register("SelectAllOnGotFocus", typeof(bool), typeof(WatermarkTextBox), new PropertyMetadata(false));
-        public bool SelectAllOnGotFocus
-        {
-            get { return (bool)GetValue(SelectAllOnGotFocusProperty); }
-            set { SetValue(SelectAllOnGotFocusProperty, value); }
-        }
+    #region SelectAllOnGotFocus
 
-        #endregion //SelectAllOnGotFocus
+    public static readonly DependencyProperty SelectAllOnGotFocusProperty = DependencyProperty.Register( "SelectAllOnGotFocus", typeof( bool ), typeof( WatermarkTextBox ), new PropertyMetadata( false ) );
+    public bool SelectAllOnGotFocus
+    {
+      get
+      {
+        return ( bool )GetValue( SelectAllOnGotFocusProperty );
+      }
+      set
+      {
+        SetValue( SelectAllOnGotFocusProperty, value );
+      }
+    }
 
-        #region Watermark
+    #endregion //SelectAllOnGotFocus
 
-        public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register("Watermark", typeof(object), typeof(WatermarkTextBox), new UIPropertyMetadata(null));
-        public object Watermark
-        {
-            get { return (object)GetValue(WatermarkProperty); }
-            set { SetValue(WatermarkProperty, value); }
-        }
+    #region Watermark
 
-        #endregion //Watermark
+    public static readonly DependencyProperty WatermarkProperty = DependencyProperty.Register( "Watermark", typeof( object ), typeof( WatermarkTextBox ), new UIPropertyMetadata( null ) );
+    public object Watermark
+    {
+      get
+      {
+        return ( object )GetValue( WatermarkProperty );
+      }
+      set
+      {
+        SetValue( WatermarkProperty, value );
+      }
+    }
 
-        #region WatermarkTemplate
+    #endregion //Watermark
 
-        public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register("WatermarkTemplate", typeof(DataTemplate), typeof(WatermarkTextBox), new UIPropertyMetadata(null));
-        public DataTemplate WatermarkTemplate
-        {
-            get { return (DataTemplate)GetValue(WatermarkTemplateProperty); }
-            set { SetValue(WatermarkTemplateProperty, value); }
-        }       
+    #region WatermarkTemplate
 
-        #endregion //WatermarkTemplate
+    public static readonly DependencyProperty WatermarkTemplateProperty = DependencyProperty.Register( "WatermarkTemplate", typeof( DataTemplate ), typeof( WatermarkTextBox ), new UIPropertyMetadata( null ) );
+    public DataTemplate WatermarkTemplate
+    {
+      get
+      {
+        return ( DataTemplate )GetValue( WatermarkTemplateProperty );
+      }
+      set
+      {
+        SetValue( WatermarkTemplateProperty, value );
+      }
+    }
 
-        #endregion //Properties
+    #endregion //WatermarkTemplate
 
-        #region Constructors
+    #endregion //Properties
 
-        static WatermarkTextBox()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(WatermarkTextBox), new FrameworkPropertyMetadata(typeof(WatermarkTextBox)));
-        }
+    #region Constructors
 
-        #endregion //Constructors
+    static WatermarkTextBox()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( WatermarkTextBox ), new FrameworkPropertyMetadata( typeof( WatermarkTextBox ) ) );
+    }
 
-        #region Base Class Overrides
+    #endregion //Constructors
 
-        protected override void OnGotKeyboardFocus(KeyboardFocusChangedEventArgs e)
-        {
-            base.OnGotKeyboardFocus(e);
+    #region Base Class Overrides
 
-            if (SelectAllOnGotFocus)
-                SelectAll();              
-        }
+    protected override void OnGotKeyboardFocus( KeyboardFocusChangedEventArgs e )
+    {
+      base.OnGotKeyboardFocus( e );
 
-        protected override void OnPreviewMouseLeftButtonDown(MouseButtonEventArgs e)
-        {
-            if (!IsKeyboardFocused && SelectAllOnGotFocus)
-            {
-                e.Handled = true;
-                Focus();
-            }
+      if( SelectAllOnGotFocus )
+        SelectAll();
+    }
 
-            base.OnPreviewMouseLeftButtonDown(e);
-        }
+    protected override void OnPreviewMouseLeftButtonDown( MouseButtonEventArgs e )
+    {
+      if( !IsKeyboardFocused && SelectAllOnGotFocus )
+      {
+        e.Handled = true;
+        Focus();
+      }
 
-        #endregion //Base Class Overrides
+      base.OnPreviewMouseLeftButtonDown( e );
     }
+
+    #endregion //Base Class Overrides
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
index c1c0ddf3..501a7879 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
@@ -1,97 +1,105 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Microsoft.Windows.Controls">
-    
-    <LinearGradientBrush x:Key="TextBoxBorder" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
-        <GradientStop Color="#ABADB3" Offset="0.05"/>
-        <GradientStop Color="#E2E3EA" Offset="0.07"/>
-        <GradientStop Color="#E3E9EF" Offset="1"/>
-    </LinearGradientBrush>
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
 
-    <LinearGradientBrush x:Key="TextBox_MouseOver" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#5794BF" Offset="0.05"/>
-        <GradientStop Color="#B7D5EA" Offset="0.07"/>
-        <GradientStop Color="#C7E2F1" Offset="1"/>
-    </LinearGradientBrush>
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
 
-    <LinearGradientBrush x:Key="TextBox_Focused" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#3D7BAD" Offset="0.05"/>
-        <GradientStop Color="#A4C9E3" Offset="0.07"/>
-        <GradientStop Color="#B7D9ED" Offset="1"/>
-    </LinearGradientBrush>
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls">
 
-    <SolidColorBrush x:Key="TextBox_DisabledBorder" Color="#ADB2B5" />
-    <SolidColorBrush x:Key="TextBox_DisabledBackground" Color="#F4F4F4" />
+   <LinearGradientBrush x:Key="TextBoxBorder" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
+      <GradientStop Color="#ABADB3" Offset="0.05" />
+      <GradientStop Color="#E2E3EA" Offset="0.07" />
+      <GradientStop Color="#E3E9EF" Offset="1" />
+   </LinearGradientBrush>
 
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
-    </DataTemplate>
+   <LinearGradientBrush x:Key="TextBox_MouseOver" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#5794BF" Offset="0.05" />
+      <GradientStop Color="#B7D5EA" Offset="0.07" />
+      <GradientStop Color="#C7E2F1" Offset="1" />
+   </LinearGradientBrush>
 
-    <Style TargetType="{x:Type local:WatermarkTextBox}">
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorder}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="3" />
-        <Setter Property="AllowDrop" Value="true"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
-                    <Grid>
+   <LinearGradientBrush x:Key="TextBox_Focused" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#3D7BAD" Offset="0.05" />
+      <GradientStop Color="#A4C9E3" Offset="0.07" />
+      <GradientStop Color="#B7D9ED" Offset="1" />
+   </LinearGradientBrush>
 
-                        <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="1" Background="{TemplateBinding Background}">
-                            
-                        </Border>
+   <SolidColorBrush x:Key="TextBox_DisabledBorder" Color="#ADB2B5" />
+   <SolidColorBrush x:Key="TextBox_DisabledBackground" Color="#F4F4F4" />
 
-                        <Border x:Name="MouseOverVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_MouseOver}" CornerRadius="1" >
-                            
-                        </Border>
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
 
-                        <Border x:Name="FocusVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_Focused}" CornerRadius="1" >
-                           
-                        </Border>
+   <Style TargetType="{x:Type local:WatermarkTextBox}">
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorder}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="AllowDrop" Value="true" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="ScrollViewer.PanningMode" Value="VerticalFirst" />
+      <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
+               <Grid>
 
-                        <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        
-                        <ContentPresenter x:Name="PART_WatermarkHost" 
-                                          Content="{TemplateBinding Watermark}"
-                                          ContentTemplate="{TemplateBinding WatermarkTemplate}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"                                       
-                                          IsHitTestVisible="False"
-                                          Margin="{TemplateBinding Padding}"
-                                          Visibility="Collapsed"/>
+                  <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="1" Background="{TemplateBinding Background}" />
+                  <Border x:Name="MouseOverVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_MouseOver}" CornerRadius="1" />
+                  <Border x:Name="FocusVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_Focused}" CornerRadius="1" />
+                  <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  <ContentPresenter x:Name="PART_WatermarkHost"
+                                    Content="{TemplateBinding Watermark}"
+                                    ContentTemplate="{TemplateBinding WatermarkTemplate}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    IsHitTestVisible="False"
+                                    Margin="{TemplateBinding Padding}"
+                                    Visibility="Collapsed" />
 
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsFocused" Value="False"></Condition>
-                                <Condition Property="Text" Value=""></Condition>
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.Setters>
-                                <Setter Property="Visibility" TargetName="PART_WatermarkHost" Value="Visible"></Setter>
-                            </MultiTrigger.Setters>
-                        </MultiTrigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="MouseOverVisual" Property="Opacity"  Value="1" />
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="FocusVisual" Property="Opacity"  Value="1" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter TargetName="Border"  Property="BorderBrush" Value="{StaticResource TextBox_DisabledBorder}"/>
-                            <Setter TargetName="Border"  Property="Background" Value="{StaticResource TextBox_DisabledBackground}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsFocused" Value="False" />
+                        <Condition Property="Text" Value="" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.Setters>
+                        <Setter Property="Visibility" TargetName="PART_WatermarkHost" Value="Visible" />
+                     </MultiTrigger.Setters>
+                  </MultiTrigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="MouseOverVisual" Property="Opacity" Value="1" />
+                  </Trigger>
+                  <Trigger Property="IsFocused" Value="True">
+                     <Setter TargetName="FocusVisual" Property="Opacity" Value="1" />
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter TargetName="Border"  Property="BorderBrush" Value="{StaticResource TextBox_DisabledBorder}" />
+                     <Setter TargetName="Border"  Property="Background" Value="{StaticResource TextBox_DisabledBackground}" />
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs
index 8a82194c..d354fbc2 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/Wizard.cs
@@ -1,4 +1,22 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -6,421 +24,559 @@ using System.Windows.Interop;
 
 namespace Microsoft.Windows.Controls
 {
-    public class Wizard : ItemsControl
+  public class Wizard : ItemsControl
+  {
+    #region Properties
+
+    public static readonly DependencyProperty BackButtonContentProperty = DependencyProperty.Register( "BackButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "< Back" ) );
+    public object BackButtonContent
     {
-        #region Properties
+      get
+      {
+        return ( object )GetValue( BackButtonContentProperty );
+      }
+      set
+      {
+        SetValue( BackButtonContentProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty BackButtonContentProperty = DependencyProperty.Register("BackButtonContent", typeof(object), typeof(Wizard), new UIPropertyMetadata("< Back"));
-        public object BackButtonContent
-        {
-            get { return (object)GetValue(BackButtonContentProperty); }
-            set { SetValue(BackButtonContentProperty, value); }
-        }
+    public static readonly DependencyProperty BackButtonVisibilityProperty = DependencyProperty.Register( "BackButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility BackButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( BackButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( BackButtonVisibilityProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty BackButtonVisibilityProperty = DependencyProperty.Register("BackButtonVisibility", typeof(Visibility), typeof(Wizard), new UIPropertyMetadata(Visibility.Visible));
-        public Visibility BackButtonVisibility
-        {
-            get { return (Visibility)GetValue(BackButtonVisibilityProperty); }
-            set { SetValue(BackButtonVisibilityProperty, value); }
-        }
+    public static readonly DependencyProperty CanCancelProperty = DependencyProperty.Register( "CanCancel", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CanCancel
+    {
+      get
+      {
+        return ( bool )GetValue( CanCancelProperty );
+      }
+      set
+      {
+        SetValue( CanCancelProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty CanCancelProperty = DependencyProperty.Register("CanCancel", typeof(bool), typeof(Wizard), new UIPropertyMetadata(true));
-        public bool CanCancel
-        {
-            get { return (bool)GetValue(CanCancelProperty); }
-            set { SetValue(CanCancelProperty, value); }
-        }
+    public static readonly DependencyProperty CancelButtonClosesWindowProperty = DependencyProperty.Register( "CancelButtonClosesWindow", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CancelButtonClosesWindow
+    {
+      get
+      {
+        return ( bool )GetValue( CancelButtonClosesWindowProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonClosesWindowProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty CancelButtonClosesWindowProperty = DependencyProperty.Register("CancelButtonClosesWindow", typeof(bool), typeof(Wizard), new UIPropertyMetadata(true));
-        public bool CancelButtonClosesWindow
-        {
-            get { return (bool)GetValue(CancelButtonClosesWindowProperty); }
-            set { SetValue(CancelButtonClosesWindowProperty, value); }
-        }
+    public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register( "CancelButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Cancel" ) );
+    public object CancelButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( CancelButtonContentProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonContentProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty CancelButtonContentProperty = DependencyProperty.Register("CancelButtonContent", typeof(object), typeof(Wizard), new UIPropertyMetadata("Cancel"));
-        public object CancelButtonContent
-        {
-            get { return (object)GetValue(CancelButtonContentProperty); }
-            set { SetValue(CancelButtonContentProperty, value); }
-        }
+    public static readonly DependencyProperty CancelButtonVisibilityProperty = DependencyProperty.Register( "CancelButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility CancelButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( CancelButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonVisibilityProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty CancelButtonVisibilityProperty = DependencyProperty.Register("CancelButtonVisibility", typeof(Visibility), typeof(Wizard), new UIPropertyMetadata(Visibility.Visible));
-        public Visibility CancelButtonVisibility
-        {
-            get { return (Visibility)GetValue(CancelButtonVisibilityProperty); }
-            set { SetValue(CancelButtonVisibilityProperty, value); }
-        }
+    public static readonly DependencyProperty CanFinishProperty = DependencyProperty.Register( "CanFinish", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( false ) );
+    public bool CanFinish
+    {
+      get
+      {
+        return ( bool )GetValue( CanFinishProperty );
+      }
+      set
+      {
+        SetValue( CanFinishProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty CanFinishProperty = DependencyProperty.Register("CanFinish", typeof(bool), typeof(Wizard), new UIPropertyMetadata(false));
-        public bool CanFinish
-        {
-            get { return (bool)GetValue(CanFinishProperty); }
-            set { SetValue(CanFinishProperty, value); }
-        }
+    public static readonly DependencyProperty CanHelpProperty = DependencyProperty.Register( "CanHelp", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CanHelp
+    {
+      get
+      {
+        return ( bool )GetValue( CanHelpProperty );
+      }
+      set
+      {
+        SetValue( CanHelpProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty CanHelpProperty = DependencyProperty.Register("CanHelp", typeof(bool), typeof(Wizard), new UIPropertyMetadata(true));
-        public bool CanHelp
-        {
-            get { return (bool)GetValue(CanHelpProperty); }
-            set { SetValue(CanHelpProperty, value); }
-        }
+    public static readonly DependencyProperty CanSelectNextPageProperty = DependencyProperty.Register( "CanSelectNextPage", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CanSelectNextPage
+    {
+      get
+      {
+        return ( bool )GetValue( CanSelectNextPageProperty );
+      }
+      set
+      {
+        SetValue( CanSelectNextPageProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty CanSelectNextPageProperty = DependencyProperty.Register("CanSelectNextPage", typeof(bool), typeof(Wizard), new UIPropertyMetadata(true));
-        public bool CanSelectNextPage
-        {
-            get { return (bool)GetValue(CanSelectNextPageProperty); }
-            set { SetValue(CanSelectNextPageProperty, value); }
-        }
+    public static readonly DependencyProperty CanSelectPreviousPageProperty = DependencyProperty.Register( "CanSelectPreviousPage", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool CanSelectPreviousPage
+    {
+      get
+      {
+        return ( bool )GetValue( CanSelectPreviousPageProperty );
+      }
+      set
+      {
+        SetValue( CanSelectPreviousPageProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty CanSelectPreviousPageProperty = DependencyProperty.Register("CanSelectPreviousPage", typeof(bool), typeof(Wizard), new UIPropertyMetadata(true));
-        public bool CanSelectPreviousPage
-        {
-            get { return (bool)GetValue(CanSelectPreviousPageProperty); }
-            set { SetValue(CanSelectPreviousPageProperty, value); }
-        }
+    #region CurrentPage
 
-        #region CurrentPage
+    public static readonly DependencyProperty CurrentPageProperty = DependencyProperty.Register( "CurrentPage", typeof( WizardPage ), typeof( Wizard ), new UIPropertyMetadata( null, OnCurrentPageChanged ) );
+    public WizardPage CurrentPage
+    {
+      get
+      {
+        return ( WizardPage )GetValue( CurrentPageProperty );
+      }
+      set
+      {
+        SetValue( CurrentPageProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty CurrentPageProperty = DependencyProperty.Register("CurrentPage", typeof(WizardPage), typeof(Wizard), new UIPropertyMetadata(null, OnCurrentPageChanged));
-        public WizardPage CurrentPage
-        {
-            get { return (WizardPage)GetValue(CurrentPageProperty); }
-            set { SetValue(CurrentPageProperty, value); }
-        }
+    private static void OnCurrentPageChanged( DependencyObject o, DependencyPropertyChangedEventArgs e )
+    {
+      Wizard wizard = o as Wizard;
+      if( wizard != null )
+        wizard.OnCurrentPageChanged( ( WizardPage )e.OldValue, ( WizardPage )e.NewValue );
+    }
 
-        private static void OnCurrentPageChanged(DependencyObject o, DependencyPropertyChangedEventArgs e)
-        {
-            Wizard wizard = o as Wizard;
-            if (wizard != null)
-                wizard.OnCurrentPageChanged((WizardPage)e.OldValue, (WizardPage)e.NewValue);
-        }
+    protected virtual void OnCurrentPageChanged( WizardPage oldValue, WizardPage newValue )
+    {
+      RaiseRoutedEvent( Wizard.PageChangedEvent );
+    }
 
-        protected virtual void OnCurrentPageChanged(WizardPage oldValue, WizardPage newValue)
-        {
-            RaiseRoutedEvent(Wizard.PageChangedEvent);
-        }
+    #endregion //CurrentPage
 
-        #endregion //CurrentPage
+    public static readonly DependencyProperty ExteriorPanelMinWidthProperty = DependencyProperty.Register( "ExteriorPanelMinWidth", typeof( double ), typeof( Wizard ), new UIPropertyMetadata( 165.0 ) );
+    public double ExteriorPanelMinWidth
+    {
+      get
+      {
+        return ( double )GetValue( ExteriorPanelMinWidthProperty );
+      }
+      set
+      {
+        SetValue( ExteriorPanelMinWidthProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty ExteriorPanelMinWidthProperty = DependencyProperty.Register("ExteriorPanelMinWidth", typeof(double), typeof(Wizard), new UIPropertyMetadata(165.0));
-        public double ExteriorPanelMinWidth
-        {
-            get { return (double)GetValue(ExteriorPanelMinWidthProperty); }
-            set { SetValue(ExteriorPanelMinWidthProperty, value); }
-        }
 
+    public static readonly DependencyProperty FinishButtonClosesWindowProperty = DependencyProperty.Register( "FinishButtonClosesWindow", typeof( bool ), typeof( Wizard ), new UIPropertyMetadata( true ) );
+    public bool FinishButtonClosesWindow
+    {
+      get
+      {
+        return ( bool )GetValue( FinishButtonClosesWindowProperty );
+      }
+      set
+      {
+        SetValue( FinishButtonClosesWindowProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty FinishButtonClosesWindowProperty = DependencyProperty.Register("FinishButtonClosesWindow", typeof(bool), typeof(Wizard), new UIPropertyMetadata(true));
-        public bool FinishButtonClosesWindow
-        {
-            get { return (bool)GetValue(FinishButtonClosesWindowProperty); }
-            set { SetValue(FinishButtonClosesWindowProperty, value); }
-        }
+    public static readonly DependencyProperty FinishButtonContentProperty = DependencyProperty.Register( "FinishButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Finish" ) );
+    public object FinishButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( FinishButtonContentProperty );
+      }
+      set
+      {
+        SetValue( FinishButtonContentProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty FinishButtonContentProperty = DependencyProperty.Register("FinishButtonContent", typeof(object), typeof(Wizard), new UIPropertyMetadata("Finish"));
-        public object FinishButtonContent
-        {
-            get { return (object)GetValue(FinishButtonContentProperty); }
-            set { SetValue(FinishButtonContentProperty, value); }
-        }
+    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility FinishButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( FinishButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( FinishButtonVisibilityProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register("FinishButtonVisibility", typeof(Visibility), typeof(Wizard), new UIPropertyMetadata(Visibility.Visible));
-        public Visibility FinishButtonVisibility
-        {
-            get { return (Visibility)GetValue(FinishButtonVisibilityProperty); }
-            set { SetValue(FinishButtonVisibilityProperty, value); }
-        }
+    public static readonly DependencyProperty HelpButtonContentProperty = DependencyProperty.Register( "HelpButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Help" ) );
+    public object HelpButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( HelpButtonContentProperty );
+      }
+      set
+      {
+        SetValue( HelpButtonContentProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty HelpButtonContentProperty = DependencyProperty.Register("HelpButtonContent", typeof(object), typeof(Wizard), new UIPropertyMetadata("Help"));
-        public object HelpButtonContent
-        {
-            get { return (object)GetValue(HelpButtonContentProperty); }
-            set { SetValue(HelpButtonContentProperty, value); }
-        }
+    public static readonly DependencyProperty HelpButtonVisibilityProperty = DependencyProperty.Register( "HelpButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility HelpButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( HelpButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( HelpButtonVisibilityProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty HelpButtonVisibilityProperty = DependencyProperty.Register("HelpButtonVisibility", typeof(Visibility), typeof(Wizard), new UIPropertyMetadata(Visibility.Visible));
-        public Visibility HelpButtonVisibility
-        {
-            get { return (Visibility)GetValue(HelpButtonVisibilityProperty); }
-            set { SetValue(HelpButtonVisibilityProperty, value); }
-        }
+    public static readonly DependencyProperty NextButtonContentProperty = DependencyProperty.Register( "NextButtonContent", typeof( object ), typeof( Wizard ), new UIPropertyMetadata( "Next >" ) );
+    public object NextButtonContent
+    {
+      get
+      {
+        return ( object )GetValue( NextButtonContentProperty );
+      }
+      set
+      {
+        SetValue( NextButtonContentProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty NextButtonContentProperty = DependencyProperty.Register("NextButtonContent", typeof(object), typeof(Wizard), new UIPropertyMetadata("Next >"));
-        public object NextButtonContent
-        {
-            get { return (object)GetValue(NextButtonContentProperty); }
-            set { SetValue(NextButtonContentProperty, value); }
-        }
+    public static readonly DependencyProperty NextButtonVisibilityProperty = DependencyProperty.Register( "NextButtonVisibility", typeof( Visibility ), typeof( Wizard ), new UIPropertyMetadata( Visibility.Visible ) );
+    public Visibility NextButtonVisibility
+    {
+      get
+      {
+        return ( Visibility )GetValue( NextButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( NextButtonVisibilityProperty, value );
+      }
+    }
 
-        public static readonly DependencyProperty NextButtonVisibilityProperty = DependencyProperty.Register("NextButtonVisibility", typeof(Visibility), typeof(Wizard), new UIPropertyMetadata(Visibility.Visible));
-        public Visibility NextButtonVisibility
-        {
-            get { return (Visibility)GetValue(NextButtonVisibilityProperty); }
-            set { SetValue(NextButtonVisibilityProperty, value); }
-        }
+    #endregion //Properties
 
-        #endregion //Properties
+    #region Constructors
 
-        #region Constructors
+    static Wizard()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( Wizard ), new FrameworkPropertyMetadata( typeof( Wizard ) ) );
+    }
 
-        static Wizard()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(Wizard), new FrameworkPropertyMetadata(typeof(Wizard)));
-        }
+    public Wizard()
+    {
+      CommandBindings.Add( new CommandBinding( WizardCommands.Cancel, ExecuteCancelWizard, CanExecuteCancelWizard ) );
+      CommandBindings.Add( new CommandBinding( WizardCommands.Finish, ExecuteFinishWizard, CanExecuteFinishWizard ) );
+      CommandBindings.Add( new CommandBinding( WizardCommands.Help, ExecuteRequestHelp, CanExecuteRequestHelp ) );
+      CommandBindings.Add( new CommandBinding( WizardCommands.NextPage, ExecuteSelectNextPage, CanExecuteSelectNextPage ) );
+      CommandBindings.Add( new CommandBinding( WizardCommands.PreviousPage, ExecuteSelectPreviousPage, CanExecuteSelectPreviousPage ) );
+    }
 
-        public Wizard()
-        {
-            CommandBindings.Add(new CommandBinding(WizardCommands.Cancel, ExecuteCancelWizard, CanExecuteCancelWizard));
-            CommandBindings.Add(new CommandBinding(WizardCommands.Finish, ExecuteFinishWizard, CanExecuteFinishWizard));
-            CommandBindings.Add(new CommandBinding(WizardCommands.Help, ExecuteRequestHelp, CanExecuteRequestHelp));
-            CommandBindings.Add(new CommandBinding(WizardCommands.NextPage, ExecuteSelectNextPage, CanExecuteSelectNextPage));
-            CommandBindings.Add(new CommandBinding(WizardCommands.PreviousPage, ExecuteSelectPreviousPage, CanExecuteSelectPreviousPage));
-        }
+    #endregion //Constructors
 
-        #endregion //Constructors
+    #region Base Class Overrides
 
-        #region Base Class Overrides
+    protected override DependencyObject GetContainerForItemOverride()
+    {
+      return new WizardPage();
+    }
 
-        protected override DependencyObject GetContainerForItemOverride()
-        {
-            return new WizardPage();
-        }
+    protected override bool IsItemItsOwnContainerOverride( object item )
+    {
+      return ( item is WizardPage );
+    }
 
-        protected override bool IsItemItsOwnContainerOverride(object item)
-        {
-            return (item is WizardPage);
-        }
+    protected override void OnInitialized( EventArgs e )
+    {
+      base.OnInitialized( e );
 
-        protected override void OnInitialized(EventArgs e)
-        {
-            base.OnInitialized(e);
+      if( Items.Count > 0 && CurrentPage == null )
+        CurrentPage = Items[ 0 ] as WizardPage;
+    }
 
-            if (Items.Count > 0 && CurrentPage == null)
-                CurrentPage = Items[0] as WizardPage;
-        }
+    #endregion //Base Class Overrides
 
-        #endregion //Base Class Overrides
+    #region Commands
 
-        #region Commands
+    private void ExecuteCancelWizard( object sender, ExecutedRoutedEventArgs e )
+    {
+      RaiseRoutedEvent( Wizard.CancelEvent );
 
-        private void ExecuteCancelWizard(object sender, ExecutedRoutedEventArgs e)
-        {
-            RaiseRoutedEvent(Wizard.CancelEvent);
+      if( CancelButtonClosesWindow )
+        CloseParentWindow( false );
+    }
 
-            if (CancelButtonClosesWindow)
-                CloseParentWindow(false);
-        }
+    private void CanExecuteCancelWizard( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanCancel.HasValue )
+          e.CanExecute = CurrentPage.CanCancel.Value;
+        else
+          e.CanExecute = CanCancel;
+      }
+    }
 
-        private void CanExecuteCancelWizard(object sender, CanExecuteRoutedEventArgs e)
-        {
-            if (CurrentPage != null)
-            {
-                if (CurrentPage.CanCancel.HasValue)
-                    e.CanExecute = CurrentPage.CanCancel.Value;
-                else
-                    e.CanExecute = CanCancel;
-            }
-        }
+    private void ExecuteFinishWizard( object sender, ExecutedRoutedEventArgs e )
+    {
+      RaiseRoutedEvent( Wizard.FinishEvent );
 
-        private void ExecuteFinishWizard(object sender, ExecutedRoutedEventArgs e)
-        {
-            RaiseRoutedEvent(Wizard.FinishEvent);
+      if( FinishButtonClosesWindow )
+        CloseParentWindow( true );
+    }
 
-            if (FinishButtonClosesWindow)
-                CloseParentWindow(true);
-        }
+    private void CanExecuteFinishWizard( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanFinish.HasValue )
+          e.CanExecute = CurrentPage.CanFinish.Value;
+        else
+          e.CanExecute = CanFinish;
+      }
+    }
 
-        private void CanExecuteFinishWizard(object sender, CanExecuteRoutedEventArgs e)
-        {
-            if (CurrentPage != null)
-            {
-                if (CurrentPage.CanFinish.HasValue)
-                    e.CanExecute = CurrentPage.CanFinish.Value;
-                else
-                    e.CanExecute = CanFinish;
-            }
-        }
+    private void ExecuteRequestHelp( object sender, ExecutedRoutedEventArgs e )
+    {
+      RaiseRoutedEvent( Wizard.HelpEvent );
+    }
 
-        private void ExecuteRequestHelp(object sender, ExecutedRoutedEventArgs e)
-        {
-            RaiseRoutedEvent(Wizard.HelpEvent);
-        }
+    private void CanExecuteRequestHelp( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanHelp.HasValue )
+          e.CanExecute = CurrentPage.CanHelp.Value;
+        else
+          e.CanExecute = CanHelp;
+      }
+    }
 
-        private void CanExecuteRequestHelp(object sender, CanExecuteRoutedEventArgs e)
-        {
-            if (CurrentPage != null)
-            {
-                if (CurrentPage.CanHelp.HasValue)
-                    e.CanExecute = CurrentPage.CanHelp.Value;
-                else
-                    e.CanExecute = CanHelp;
-            }
-        }
+    private void ExecuteSelectNextPage( object sender, ExecutedRoutedEventArgs e )
+    {
+      WizardPage nextPage = null;
 
-        private void ExecuteSelectNextPage(object sender, ExecutedRoutedEventArgs e)
+      if( CurrentPage != null )
+      {
+        //check next page
+        if( CurrentPage.NextPage != null )
+          nextPage = CurrentPage.NextPage;
+        else
         {
-            WizardPage nextPage = null;
-
-            if (CurrentPage != null)
-            {
-                //check next page
-                if (CurrentPage.NextPage != null)
-                    nextPage = CurrentPage.NextPage;
-                else
-                {
-                    //no next page defined use index
-                    var currentIndex = Items.IndexOf(CurrentPage);
-                    var nextPageIndex = currentIndex + 1;
-                    if (nextPageIndex < Items.Count)
-                        nextPage = Items[nextPageIndex] as WizardPage;
-                }
-            }
-
-            CurrentPage = nextPage;
+          //no next page defined use index
+          var currentIndex = Items.IndexOf( CurrentPage );
+          var nextPageIndex = currentIndex + 1;
+          if( nextPageIndex < Items.Count )
+            nextPage = Items[ nextPageIndex ] as WizardPage;
         }
+      }
 
-        private void CanExecuteSelectNextPage(object sender, CanExecuteRoutedEventArgs e)
-        {
-            if (CurrentPage != null)
-            {
-                if (CurrentPage.CanSelectNextPage.HasValue) //check to see if page has overriden default behavior
-                {
-                    if (CurrentPage.CanSelectNextPage.Value)
-                        e.CanExecute = NextPageExists();
-                }
-                else if (CanSelectNextPage)
-                    e.CanExecute = NextPageExists();
-            }
-        }
+      CurrentPage = nextPage;
+    }
 
-        private void ExecuteSelectPreviousPage(object sender, ExecutedRoutedEventArgs e)
+    private void CanExecuteSelectNextPage( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanSelectNextPage.HasValue ) //check to see if page has overriden default behavior
         {
-            WizardPage previousPage = null;
-
-            if (CurrentPage != null)
-            {
-                //check previous page
-                if (CurrentPage.PreviousPage != null)
-                    previousPage = CurrentPage.PreviousPage;
-                else
-                {
-                    //no previous page defined so use index
-                    var currentIndex = Items.IndexOf(CurrentPage);
-                    var previousPageIndex = currentIndex - 1;
-                    if (previousPageIndex >= 0 && previousPageIndex < Items.Count)
-                        previousPage = Items[previousPageIndex] as WizardPage;
-                }
-            }
-
-            CurrentPage = previousPage;
+          if( CurrentPage.CanSelectNextPage.Value )
+            e.CanExecute = NextPageExists();
         }
+        else if( CanSelectNextPage )
+          e.CanExecute = NextPageExists();
+      }
+    }
 
-        private void CanExecuteSelectPreviousPage(object sender, CanExecuteRoutedEventArgs e)
+    private void ExecuteSelectPreviousPage( object sender, ExecutedRoutedEventArgs e )
+    {
+      WizardPage previousPage = null;
+
+      if( CurrentPage != null )
+      {
+        //check previous page
+        if( CurrentPage.PreviousPage != null )
+          previousPage = CurrentPage.PreviousPage;
+        else
         {
-            if (CurrentPage != null)
-            {
-                if (CurrentPage.CanSelectPreviousPage.HasValue) //check to see if page has overriden default behavior
-                {
-                    if (CurrentPage.CanSelectPreviousPage.Value)
-                        e.CanExecute = PreviousPageExists();
-                }
-                else if (CanSelectPreviousPage)
-                    e.CanExecute = PreviousPageExists();
-            }
+          //no previous page defined so use index
+          var currentIndex = Items.IndexOf( CurrentPage );
+          var previousPageIndex = currentIndex - 1;
+          if( previousPageIndex >= 0 && previousPageIndex < Items.Count )
+            previousPage = Items[ previousPageIndex ] as WizardPage;
         }
+      }
 
-        #endregion //Commands
-
-        #region Events
+      CurrentPage = previousPage;
+    }
 
-        public static readonly RoutedEvent CancelEvent = EventManager.RegisterRoutedEvent("Cancel", RoutingStrategy.Bubble, typeof(EventHandler), typeof(Wizard));
-        public event RoutedEventHandler Cancel
+    private void CanExecuteSelectPreviousPage( object sender, CanExecuteRoutedEventArgs e )
+    {
+      if( CurrentPage != null )
+      {
+        if( CurrentPage.CanSelectPreviousPage.HasValue ) //check to see if page has overriden default behavior
         {
-            add { AddHandler(CancelEvent, value); }
-            remove { RemoveHandler(CancelEvent, value); }
+          if( CurrentPage.CanSelectPreviousPage.Value )
+            e.CanExecute = PreviousPageExists();
         }
+        else if( CanSelectPreviousPage )
+          e.CanExecute = PreviousPageExists();
+      }
+    }
 
-        public static readonly RoutedEvent PageChangedEvent = EventManager.RegisterRoutedEvent("PageChanged", RoutingStrategy.Bubble, typeof(EventHandler), typeof(Wizard));
-        public event RoutedEventHandler PageChanged
-        {
-            add { AddHandler(PageChangedEvent, value); }
-            remove { RemoveHandler(PageChangedEvent, value); }
-        }
+    #endregion //Commands
 
-        public static readonly RoutedEvent FinishEvent = EventManager.RegisterRoutedEvent("Finish", RoutingStrategy.Bubble, typeof(EventHandler), typeof(Wizard));
-        public event RoutedEventHandler Finish
-        {
-            add { AddHandler(FinishEvent, value); }
-            remove { RemoveHandler(FinishEvent, value); }
-        }
+    #region Events
 
-        public static readonly RoutedEvent HelpEvent = EventManager.RegisterRoutedEvent("Help", RoutingStrategy.Bubble, typeof(EventHandler), typeof(Wizard));
-        public event RoutedEventHandler Help
-        {
-            add { AddHandler(HelpEvent, value); }
-            remove { RemoveHandler(HelpEvent, value); }
-        }
+    public static readonly RoutedEvent CancelEvent = EventManager.RegisterRoutedEvent( "Cancel", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
+    public event RoutedEventHandler Cancel
+    {
+      add
+      {
+        AddHandler( CancelEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( CancelEvent, value );
+      }
+    }
+
+    public static readonly RoutedEvent PageChangedEvent = EventManager.RegisterRoutedEvent( "PageChanged", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
+    public event RoutedEventHandler PageChanged
+    {
+      add
+      {
+        AddHandler( PageChangedEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( PageChangedEvent, value );
+      }
+    }
 
-        #endregion //Events
+    public static readonly RoutedEvent FinishEvent = EventManager.RegisterRoutedEvent( "Finish", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
+    public event RoutedEventHandler Finish
+    {
+      add
+      {
+        AddHandler( FinishEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( FinishEvent, value );
+      }
+    }
 
-        #region Methods
+    public static readonly RoutedEvent HelpEvent = EventManager.RegisterRoutedEvent( "Help", RoutingStrategy.Bubble, typeof( EventHandler ), typeof( Wizard ) );
+    public event RoutedEventHandler Help
+    {
+      add
+      {
+        AddHandler( HelpEvent, value );
+      }
+      remove
+      {
+        RemoveHandler( HelpEvent, value );
+      }
+    }
 
-        private void CloseParentWindow(bool dialogResult)
-        {
-            Window window = Window.GetWindow(this);
-            if (window != null)
-            {
-                //we can only set the DialogResult if the window was opened as modal with the ShowDialog() method. Otherwise an exception would occur
-                if (ComponentDispatcher.IsThreadModal)
-                    window.DialogResult = dialogResult;
-
-                window.Close();
-            }
-        }
+    #endregion //Events
 
-        private bool NextPageExists()
-        {
-            bool exists = false;
-
-            if (CurrentPage.NextPage != null) //check to see if a next page has been specified
-                exists = true;
-            else
-            {
-                //lets use an index to find the next page
-                var currentIndex = Items.IndexOf(CurrentPage);
-                var nextPageIndex = currentIndex + 1;
-                if (nextPageIndex < Items.Count)
-                    exists = true;
-            }
-
-            return exists;
-        }
+    #region Methods
 
-        private bool PreviousPageExists()
-        {
-            bool exists = false;
-
-            if (CurrentPage.PreviousPage != null) //check to see if a previous page has been specified
-                exists = true;
-            else
-            {
-                //lets use an index to find the next page
-                var currentIndex = Items.IndexOf(CurrentPage);
-                var previousPageIndex = currentIndex - 1;
-                if (previousPageIndex >= 0 && previousPageIndex < Items.Count)
-                    exists = true;
-            }
-
-            return exists;
-        }
+    private void CloseParentWindow( bool dialogResult )
+    {
+      Window window = Window.GetWindow( this );
+      if( window != null )
+      {
+        //we can only set the DialogResult if the window was opened as modal with the ShowDialog() method. Otherwise an exception would occur
+        if( ComponentDispatcher.IsThreadModal )
+          window.DialogResult = dialogResult;
+
+        window.Close();
+      }
+    }
 
-        private void RaiseRoutedEvent(RoutedEvent routedEvent)
-        {
-            RoutedEventArgs newEventArgs = new RoutedEventArgs(routedEvent, this);
-            base.RaiseEvent(newEventArgs);
-        }
+    private bool NextPageExists()
+    {
+      bool exists = false;
+
+      if( CurrentPage.NextPage != null ) //check to see if a next page has been specified
+        exists = true;
+      else
+      {
+        //lets use an index to find the next page
+        var currentIndex = Items.IndexOf( CurrentPage );
+        var nextPageIndex = currentIndex + 1;
+        if( nextPageIndex < Items.Count )
+          exists = true;
+      }
+
+      return exists;
+    }
 
-        #endregion //Methods
+    private bool PreviousPageExists()
+    {
+      bool exists = false;
+
+      if( CurrentPage.PreviousPage != null ) //check to see if a previous page has been specified
+        exists = true;
+      else
+      {
+        //lets use an index to find the next page
+        var currentIndex = Items.IndexOf( CurrentPage );
+        var previousPageIndex = currentIndex - 1;
+        if( previousPageIndex >= 0 && previousPageIndex < Items.Count )
+          exists = true;
+      }
+
+      return exists;
     }
+
+    private void RaiseRoutedEvent( RoutedEvent routedEvent )
+    {
+      RoutedEventArgs newEventArgs = new RoutedEventArgs( routedEvent, this );
+      base.RaiseEvent( newEventArgs );
+    }
+
+    #endregion //Methods
+  }
 }
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs
index e90a948c..ae3f72d5 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardCommands.cs
@@ -1,45 +1,80 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows.Input;
 
 namespace Microsoft.Windows.Controls
 {
-    public static class WizardCommands
+  public static class WizardCommands
+  {
+
+    private static RoutedCommand _cancelCommand = new RoutedCommand();
+    public static RoutedCommand Cancel
     {
+      get
+      {
+        return _cancelCommand;
+      }
+    }
+
+    private static RoutedCommand _finishCommand = new RoutedCommand();
+    public static RoutedCommand Finish
+    {
+      get
+      {
+        return _finishCommand;
+      }
+    }
 
-        private static RoutedCommand _cancelCommand = new RoutedCommand();
-        public static RoutedCommand Cancel
-        {
-            get { return _cancelCommand; }
-        }
-
-        private static RoutedCommand _finishCommand = new RoutedCommand();
-        public static RoutedCommand Finish
-        {
-            get { return _finishCommand; }
-        }
-
-        private static RoutedCommand _helpCommand = new RoutedCommand();
-        public static RoutedCommand Help
-        {
-            get { return _helpCommand; }
-        }
-
-        private static RoutedCommand _nextPageCommand = new RoutedCommand();
-        public static RoutedCommand NextPage
-        {
-            get { return _nextPageCommand; }
-        }
-
-        private static RoutedCommand _previousPageCommand = new RoutedCommand();
-        public static RoutedCommand PreviousPage
-        {
-            get { return _previousPageCommand; }
-        }
-
-        private static RoutedCommand _selectPageCommand = new RoutedCommand();
-        public static RoutedCommand SelectPage
-        {
-            get { return _selectPageCommand; }
-        }
+    private static RoutedCommand _helpCommand = new RoutedCommand();
+    public static RoutedCommand Help
+    {
+      get
+      {
+        return _helpCommand;
+      }
+    }
+
+    private static RoutedCommand _nextPageCommand = new RoutedCommand();
+    public static RoutedCommand NextPage
+    {
+      get
+      {
+        return _nextPageCommand;
+      }
+    }
+
+    private static RoutedCommand _previousPageCommand = new RoutedCommand();
+    public static RoutedCommand PreviousPage
+    {
+      get
+      {
+        return _previousPageCommand;
+      }
+    }
+
+    private static RoutedCommand _selectPageCommand = new RoutedCommand();
+    public static RoutedCommand SelectPage
+    {
+      get
+      {
+        return _selectPageCommand;
+      }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs
index 23ded86c..4b8b9d92 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPage.cs
@@ -1,156 +1,287 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 
 namespace Microsoft.Windows.Controls
 {
-    public class WizardPage : ContentControl
-    {
-        #region Properties
-
-        public static readonly DependencyProperty BackButtonVisibilityProperty = DependencyProperty.Register("BackButtonVisibility", typeof(WizardPageButtonVisibility), typeof(WizardPage), new UIPropertyMetadata(WizardPageButtonVisibility.Inherit));
-        public WizardPageButtonVisibility BackButtonVisibility
-        {
-            get { return (WizardPageButtonVisibility)GetValue(BackButtonVisibilityProperty); }
-            set { SetValue(BackButtonVisibilityProperty, value); }
-        }
-
-        public static readonly DependencyProperty CanCancelProperty = DependencyProperty.Register("CanCancel", typeof(bool?), typeof(WizardPage), new UIPropertyMetadata(null));
-        public bool? CanCancel
-        {
-            get { return (bool?)GetValue(CanCancelProperty); }
-            set { SetValue(CanCancelProperty, value); }
-        }
-
-        public static readonly DependencyProperty CancelButtonVisibilityProperty = DependencyProperty.Register("CancelButtonVisibility", typeof(WizardPageButtonVisibility), typeof(WizardPage), new UIPropertyMetadata(WizardPageButtonVisibility.Inherit));
-        public WizardPageButtonVisibility CancelButtonVisibility
-        {
-            get { return (WizardPageButtonVisibility)GetValue(CancelButtonVisibilityProperty); }
-            set { SetValue(CancelButtonVisibilityProperty, value); }
-        }
-
-        public static readonly DependencyProperty CanFinishProperty = DependencyProperty.Register("CanFinish", typeof(bool?), typeof(WizardPage), new UIPropertyMetadata(null));
-        public bool? CanFinish
-        {
-            get { return (bool?)GetValue(CanFinishProperty); }
-            set { SetValue(CanFinishProperty, value); }
-        }
-
-        public static readonly DependencyProperty CanHelpProperty = DependencyProperty.Register("CanHelp", typeof(bool?), typeof(WizardPage), new UIPropertyMetadata(null));
-        public bool? CanHelp
-        {
-            get { return (bool?)GetValue(CanHelpProperty); }
-            set { SetValue(CanHelpProperty, value); }
-        }
-
-        public static readonly DependencyProperty CanSelectNextPageProperty = DependencyProperty.Register("CanSelectNextPage", typeof(bool?), typeof(WizardPage), new UIPropertyMetadata(null));
-        public bool? CanSelectNextPage
-        {
-            get { return (bool?)GetValue(CanSelectNextPageProperty); }
-            set { SetValue(CanSelectNextPageProperty, value); }
-        }
-
-        public static readonly DependencyProperty CanSelectPreviousPageProperty = DependencyProperty.Register("CanSelectPreviousPage", typeof(bool?), typeof(WizardPage), new UIPropertyMetadata(null));
-        public bool? CanSelectPreviousPage
-        {
-            get { return (bool?)GetValue(CanSelectPreviousPageProperty); }
-            set { SetValue(CanSelectPreviousPageProperty, value); }
-        }
-
-        public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register("Description", typeof(string), typeof(WizardPage));
-        public string Description
-        {
-            get { return (string)base.GetValue(DescriptionProperty); }
-            set { base.SetValue(DescriptionProperty, value); }
-        }
-
-        public static readonly DependencyProperty ExteriorPanelBackgroundProperty = DependencyProperty.Register("ExteriorPanelBackground", typeof(Brush), typeof(WizardPage), new UIPropertyMetadata(null));
-        public Brush ExteriorPanelBackground
-        {
-            get { return (Brush)GetValue(ExteriorPanelBackgroundProperty); }
-            set { SetValue(ExteriorPanelBackgroundProperty, value); }
-        }        
-
-        public static readonly DependencyProperty ExteriorPanelContentProperty = DependencyProperty.Register("ExteriorPanelContent", typeof(object), typeof(WizardPage), new UIPropertyMetadata(null));
-        public object ExteriorPanelContent
-        {
-            get { return (object)GetValue(ExteriorPanelContentProperty); }
-            set { SetValue(ExteriorPanelContentProperty, value); }
-        }
-
-        public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register("FinishButtonVisibility", typeof(WizardPageButtonVisibility), typeof(WizardPage), new UIPropertyMetadata(WizardPageButtonVisibility.Inherit));
-        public WizardPageButtonVisibility FinishButtonVisibility
-        {
-            get { return (WizardPageButtonVisibility)GetValue(FinishButtonVisibilityProperty); }
-            set { SetValue(FinishButtonVisibilityProperty, value); }
-        }
-
-        public static readonly DependencyProperty HeaderBackgroundProperty = DependencyProperty.Register("HeaderBackground", typeof(Brush), typeof(WizardPage), new UIPropertyMetadata(Brushes.White));
-        public Brush HeaderBackground
-        {
-            get { return (Brush)GetValue(HeaderBackgroundProperty); }
-            set { SetValue(HeaderBackgroundProperty, value); }
-        }
-
-        public static readonly DependencyProperty HeaderImageProperty = DependencyProperty.Register("HeaderImage", typeof(ImageSource), typeof(WizardPage), new UIPropertyMetadata(null));
-        public ImageSource HeaderImage
-        {
-            get { return (ImageSource)GetValue(HeaderImageProperty); }
-            set { SetValue(HeaderImageProperty, value); }
-        }
-
-        public static readonly DependencyProperty HelpButtonVisibilityProperty = DependencyProperty.Register("HelpButtonVisibility", typeof(WizardPageButtonVisibility), typeof(WizardPage), new UIPropertyMetadata(WizardPageButtonVisibility.Inherit));
-        public WizardPageButtonVisibility HelpButtonVisibility
-        {
-            get { return (WizardPageButtonVisibility)GetValue(HelpButtonVisibilityProperty); }
-            set { SetValue(HelpButtonVisibilityProperty, value); }
-        }
-
-        public static readonly DependencyProperty NextButtonVisibilityProperty = DependencyProperty.Register("NextButtonVisibility", typeof(WizardPageButtonVisibility), typeof(WizardPage), new UIPropertyMetadata(WizardPageButtonVisibility.Inherit));
-        public WizardPageButtonVisibility NextButtonVisibility
-        {
-            get { return (WizardPageButtonVisibility)GetValue(NextButtonVisibilityProperty); }
-            set { SetValue(NextButtonVisibilityProperty, value); }
-        }
-
-        public static readonly DependencyProperty NextPageProperty = DependencyProperty.Register("NextPage", typeof(WizardPage), typeof(WizardPage), new UIPropertyMetadata(null));
-        public WizardPage NextPage
-        {
-            get { return (WizardPage)GetValue(NextPageProperty); }
-            set { SetValue(NextPageProperty, value); }
-        }
-
-        public static readonly DependencyProperty PageTypeProperty = DependencyProperty.Register("PageType", typeof(WizardPageType), typeof(WizardPage), new UIPropertyMetadata(WizardPageType.Exterior));
-        public WizardPageType PageType
-        {
-            get { return (WizardPageType)GetValue(PageTypeProperty); }
-            set { SetValue(PageTypeProperty, value); }
-        }
-
-        public static readonly DependencyProperty PreviousPageProperty = DependencyProperty.Register("PreviousPage", typeof(WizardPage), typeof(WizardPage), new UIPropertyMetadata(null));
-        public WizardPage PreviousPage
-        {
-            get { return (WizardPage)GetValue(PreviousPageProperty); }
-            set { SetValue(PreviousPageProperty, value); }
-        }
-
-        public static readonly DependencyProperty TitleProperty = DependencyProperty.Register("Title", typeof(string), typeof(WizardPage));
-        public string Title
-        {
-            get { return (string)base.GetValue(TitleProperty); }
-            set { base.SetValue(TitleProperty, value); }
-        }
-
-        #endregion //Properties
-
-        #region Constructors
-
-        static WizardPage()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(WizardPage), new FrameworkPropertyMetadata(typeof(WizardPage)));
-        }
-
-        #endregion //Constructors
+  public class WizardPage : ContentControl
+  {
+    #region Properties
+
+    public static readonly DependencyProperty BackButtonVisibilityProperty = DependencyProperty.Register( "BackButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility BackButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( BackButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( BackButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanCancelProperty = DependencyProperty.Register( "CanCancel", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanCancel
+    {
+      get
+      {
+        return ( bool? )GetValue( CanCancelProperty );
+      }
+      set
+      {
+        SetValue( CanCancelProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CancelButtonVisibilityProperty = DependencyProperty.Register( "CancelButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility CancelButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( CancelButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( CancelButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanFinishProperty = DependencyProperty.Register( "CanFinish", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanFinish
+    {
+      get
+      {
+        return ( bool? )GetValue( CanFinishProperty );
+      }
+      set
+      {
+        SetValue( CanFinishProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanHelpProperty = DependencyProperty.Register( "CanHelp", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanHelp
+    {
+      get
+      {
+        return ( bool? )GetValue( CanHelpProperty );
+      }
+      set
+      {
+        SetValue( CanHelpProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanSelectNextPageProperty = DependencyProperty.Register( "CanSelectNextPage", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanSelectNextPage
+    {
+      get
+      {
+        return ( bool? )GetValue( CanSelectNextPageProperty );
+      }
+      set
+      {
+        SetValue( CanSelectNextPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty CanSelectPreviousPageProperty = DependencyProperty.Register( "CanSelectPreviousPage", typeof( bool? ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public bool? CanSelectPreviousPage
+    {
+      get
+      {
+        return ( bool? )GetValue( CanSelectPreviousPageProperty );
+      }
+      set
+      {
+        SetValue( CanSelectPreviousPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty DescriptionProperty = DependencyProperty.Register( "Description", typeof( string ), typeof( WizardPage ) );
+    public string Description
+    {
+      get
+      {
+        return ( string )base.GetValue( DescriptionProperty );
+      }
+      set
+      {
+        base.SetValue( DescriptionProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ExteriorPanelBackgroundProperty = DependencyProperty.Register( "ExteriorPanelBackground", typeof( Brush ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public Brush ExteriorPanelBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( ExteriorPanelBackgroundProperty );
+      }
+      set
+      {
+        SetValue( ExteriorPanelBackgroundProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty ExteriorPanelContentProperty = DependencyProperty.Register( "ExteriorPanelContent", typeof( object ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public object ExteriorPanelContent
+    {
+      get
+      {
+        return ( object )GetValue( ExteriorPanelContentProperty );
+      }
+      set
+      {
+        SetValue( ExteriorPanelContentProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty FinishButtonVisibilityProperty = DependencyProperty.Register( "FinishButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility FinishButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( FinishButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( FinishButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty HeaderBackgroundProperty = DependencyProperty.Register( "HeaderBackground", typeof( Brush ), typeof( WizardPage ), new UIPropertyMetadata( Brushes.White ) );
+    public Brush HeaderBackground
+    {
+      get
+      {
+        return ( Brush )GetValue( HeaderBackgroundProperty );
+      }
+      set
+      {
+        SetValue( HeaderBackgroundProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty HeaderImageProperty = DependencyProperty.Register( "HeaderImage", typeof( ImageSource ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public ImageSource HeaderImage
+    {
+      get
+      {
+        return ( ImageSource )GetValue( HeaderImageProperty );
+      }
+      set
+      {
+        SetValue( HeaderImageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty HelpButtonVisibilityProperty = DependencyProperty.Register( "HelpButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility HelpButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( HelpButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( HelpButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NextButtonVisibilityProperty = DependencyProperty.Register( "NextButtonVisibility", typeof( WizardPageButtonVisibility ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageButtonVisibility.Inherit ) );
+    public WizardPageButtonVisibility NextButtonVisibility
+    {
+      get
+      {
+        return ( WizardPageButtonVisibility )GetValue( NextButtonVisibilityProperty );
+      }
+      set
+      {
+        SetValue( NextButtonVisibilityProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty NextPageProperty = DependencyProperty.Register( "NextPage", typeof( WizardPage ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public WizardPage NextPage
+    {
+      get
+      {
+        return ( WizardPage )GetValue( NextPageProperty );
+      }
+      set
+      {
+        SetValue( NextPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty PageTypeProperty = DependencyProperty.Register( "PageType", typeof( WizardPageType ), typeof( WizardPage ), new UIPropertyMetadata( WizardPageType.Exterior ) );
+    public WizardPageType PageType
+    {
+      get
+      {
+        return ( WizardPageType )GetValue( PageTypeProperty );
+      }
+      set
+      {
+        SetValue( PageTypeProperty, value );
+      }
     }
+
+    public static readonly DependencyProperty PreviousPageProperty = DependencyProperty.Register( "PreviousPage", typeof( WizardPage ), typeof( WizardPage ), new UIPropertyMetadata( null ) );
+    public WizardPage PreviousPage
+    {
+      get
+      {
+        return ( WizardPage )GetValue( PreviousPageProperty );
+      }
+      set
+      {
+        SetValue( PreviousPageProperty, value );
+      }
+    }
+
+    public static readonly DependencyProperty TitleProperty = DependencyProperty.Register( "Title", typeof( string ), typeof( WizardPage ) );
+    public string Title
+    {
+      get
+      {
+        return ( string )base.GetValue( TitleProperty );
+      }
+      set
+      {
+        base.SetValue( TitleProperty, value );
+      }
+    }
+
+    #endregion //Properties
+
+    #region Constructors
+
+    static WizardPage()
+    {
+      DefaultStyleKeyProperty.OverrideMetadata( typeof( WizardPage ), new FrameworkPropertyMetadata( typeof( WizardPage ) ) );
+    }
+
+    #endregion //Constructors
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs
index 98423dfb..6bbb3286 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageButtonVisibility.cs
@@ -1,12 +1,29 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls
 {
-    public enum WizardPageButtonVisibility
-    {
-        Inherit,
-        Collapsed,
-        Hidden,
-        Visible
-    }
+  public enum WizardPageButtonVisibility
+  {
+    Inherit,
+    Collapsed,
+    Hidden,
+    Visible
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs
index 52676603..2c41fb9a 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Implementation/WizardPageType.cs
@@ -1,11 +1,28 @@
-using System;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 
 namespace Microsoft.Windows.Controls
 {
-    public enum WizardPageType
-    {
-        Blank,
-        Exterior,
-        Interior
-    }
+  public enum WizardPageType
+  {
+    Blank,
+    Exterior,
+    Interior
+  }
 }
diff --git a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml
index b1f474f1..f8ac834b 100644
--- a/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml
@@ -1,182 +1,208 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <coreConverters:WizardPageButtonVisibilityConverter x:Key="WizardPageButtonVisibilityConverter" />
-
-    <Style TargetType="{x:Type local:Wizard}">
-        <Setter Property="Background" Value="#F0F0F0" />
-        <Setter Property="BorderBrush" Value="#A0A0A0" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ItemsPanel">
-            <Setter.Value>
-                <ItemsPanelTemplate>
-                    <Grid />
-                </ItemsPanelTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:Wizard}">
-                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid Background="{TemplateBinding Background}">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-
-                            <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
-
-                            <Border Grid.Row="1" Background="#F0F0F0" BorderBrush="#A0A0A0" BorderThickness="0,1,0,0" Padding="7"  >
-                                <StackPanel Background="{TemplateBinding Background}">
-                                    <Grid Margin="{TemplateBinding Padding}">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="*" />
-                                        </Grid.ColumnDefinitions>
-                                        <Button Name="PART_HelpButton" Grid.Column="0" MinWidth="75" 
-                                            Command="local:WizardCommands.Help" 
-                                            Content="{TemplateBinding HelpButtonContent}">
-                                            <Button.Visibility>
-                                                <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}" >
-                                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="HelpButtonVisibility" />
-                                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.HelpButtonVisibility" />
-                                                </MultiBinding>
-                                            </Button.Visibility>
-                                        </Button>
-                                        <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-                                            <Button Name="PART_CancelButton" Margin="0,0,7,0" MinWidth="75" 
-                                                Command="local:WizardCommands.Cancel" 
-                                                Content="{TemplateBinding CancelButtonContent}" >
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}" >
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CancelButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.CancelButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                            <Button Name="PART_BackButton" MinWidth="75" 
-                                                Command="local:WizardCommands.PreviousPage" 
-                                                Content="{TemplateBinding BackButtonContent}" >
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}" >
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BackButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.BackButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                            <Button Name="PART_NextButton" MinWidth="75" 
-                                                Command="local:WizardCommands.NextPage"
-                                                Content="{TemplateBinding NextButtonContent}" >
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}" >
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NextButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.NextButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                            <Button Name="PART_FinishButton" Margin="7,0,0,0" MinWidth="75" 
-                                                Command="local:WizardCommands.Finish" 
-                                                Content="{TemplateBinding FinishButtonContent}" >
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}" >
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FinishButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.FinishButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                        </StackPanel>
-                                    </Grid>
-                                </StackPanel>
-                            </Border>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <ControlTemplate x:Key="BlankWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-        <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <Grid Background="{TemplateBinding Background}">
-                <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-            </Grid>
-        </Border>
-    </ControlTemplate>
+   <coreConverters:WizardPageButtonVisibilityConverter x:Key="WizardPageButtonVisibilityConverter" />
 
-    <ControlTemplate x:Key="ExteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-        <Grid Background="{TemplateBinding Background}">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Border SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-                <Grid Grid.Column="0" Background="{TemplateBinding ExteriorPanelBackground}" MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}" >
-                    <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
-                </Grid>
-            </Border>
-            <Grid Column="1" Margin="14">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-                <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,14" FontSize="16" FontWeight="Bold" Text="{TemplateBinding Title}" />
-                <TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,0,0,14" Text="{TemplateBinding Description}" />
-                <ContentPresenter Grid.Row="2" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-            </Grid>
-        </Grid>
-    </ControlTemplate>
+   <Style TargetType="{x:Type local:Wizard}">
+      <Setter Property="Background" Value="#F0F0F0" />
+      <Setter Property="BorderBrush" Value="#A0A0A0" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="ItemsPanel">
+         <Setter.Value>
+            <ItemsPanelTemplate>
+               <Grid />
+            </ItemsPanelTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:Wizard}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid Background="{TemplateBinding Background}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+
+                     <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
+
+                     <Border Grid.Row="1" Background="#F0F0F0" BorderBrush="#A0A0A0" BorderThickness="0,1,0,0" Padding="7">
+                        <StackPanel Background="{TemplateBinding Background}">
+                           <Grid Margin="{TemplateBinding Padding}">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto" />
+                                 <ColumnDefinition Width="*" />
+                              </Grid.ColumnDefinitions>
+                              <Button Name="PART_HelpButton"
+                                      Grid.Column="0"
+                                      MinWidth="75" 
+                                      Command="local:WizardCommands.Help" 
+                                      Content="{TemplateBinding HelpButtonContent}">
+                                 <Button.Visibility>
+                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                       <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="HelpButtonVisibility" />
+                                       <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.HelpButtonVisibility" />
+                                    </MultiBinding>
+                                 </Button.Visibility>
+                              </Button>
+                              <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+                                 <Button Name="PART_CancelButton"
+                                         Margin="0,0,7,0"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.Cancel" 
+                                         Content="{TemplateBinding CancelButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CancelButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.CancelButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                                 <Button Name="PART_BackButton"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.PreviousPage" 
+                                         Content="{TemplateBinding BackButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BackButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.BackButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                                 <Button Name="PART_NextButton"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.NextPage"
+                                         Content="{TemplateBinding NextButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NextButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.NextButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                                 <Button Name="PART_FinishButton"
+                                         Margin="7,0,0,0"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.Finish" 
+                                         Content="{TemplateBinding FinishButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FinishButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.FinishButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                              </StackPanel>
+                           </Grid>
+                        </StackPanel>
+                     </Border>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
-    <ControlTemplate x:Key="InteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-        <Grid>
+   <ControlTemplate x:Key="BlankWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+      <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+         <Grid Background="{TemplateBinding Background}">
+            <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+         </Grid>
+      </Border>
+   </ControlTemplate>
+
+   <ControlTemplate x:Key="ExteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+      <Grid Background="{TemplateBinding Background}">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+         <Border SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <Grid Grid.Column="0" Background="{TemplateBinding ExteriorPanelBackground}" MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}">
+               <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
+            </Grid>
+         </Border>
+         <Grid Column="1" Margin="14">
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="*" />
             </Grid.RowDefinitions>
+            <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,14" FontSize="16" FontWeight="Bold" Text="{TemplateBinding Title}" />
+            <TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,0,0,14" Text="{TemplateBinding Description}" />
+            <ContentPresenter Grid.Row="2" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+         </Grid>
+      </Grid>
+   </ControlTemplate>
 
-            <Grid Background="{TemplateBinding HeaderBackground}" MinHeight="56" >
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <StackPanel>
-                    <TextBlock Margin="16,9,0,1" TextWrapping="Wrap" FontWeight="Bold" Text="{TemplateBinding Title}" />
-                    <TextBlock Margin="32,0,0,3" TextWrapping="Wrap" Text="{TemplateBinding Description}" />
-                </StackPanel>
-                <Image Grid.Column="1" Margin="4" Source="{TemplateBinding HeaderImage}" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" />
+   <ControlTemplate x:Key="InteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+         </Grid.RowDefinitions>
+
+         <Grid Background="{TemplateBinding HeaderBackground}" MinHeight="56">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <StackPanel>
+               <TextBlock Margin="16,9,0,1" TextWrapping="Wrap" FontWeight="Bold" Text="{TemplateBinding Title}" />
+               <TextBlock Margin="32,0,0,3" TextWrapping="Wrap" Text="{TemplateBinding Description}" />
+            </StackPanel>
+            <Image Grid.Column="1" Margin="4" Source="{TemplateBinding HeaderImage}" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" />
+         </Grid>
+
+         <Border Grid.Row="1" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <Grid Background="{TemplateBinding Background}">
+               <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
             </Grid>
+         </Border>
+      </Grid>
+   </ControlTemplate>
 
-            <Border Grid.Row="1" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-                <Grid Background="{TemplateBinding Background}">
-                    <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-                </Grid>
-            </Border>
-        </Grid>
-    </ControlTemplate>
-
-    <Style TargetType="{x:Type local:WizardPage}">
-        <Style.Triggers>
-            <Trigger Property="PageType" Value="Blank">
-                <Setter Property="Background" Value="#FFF0F0F0" />
-                <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Template" Value="{StaticResource BlankWizardPageTemplate}" />
-            </Trigger>
-            <Trigger Property="PageType" Value="Exterior">
-                <Setter Property="Background" Value="#FFFFFF" />
-                <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="ExteriorPanelBackground" Value="#E3EFFF" />
-                <Setter Property="Template" Value="{StaticResource ExteriorWizardPageTemplate}" />
-            </Trigger>
-            <Trigger Property="PageType" Value="Interior">
-                <Setter Property="Background" Value="#FFF0F0F0" />
-                <Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
-                <Setter Property="BorderThickness" Value="0,1,0,0" />
-                <Setter Property="HeaderBackground" Value="#FFFFFF" />
-                <Setter Property="Template" Value="{StaticResource InteriorWizardPageTemplate}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
+   <Style TargetType="{x:Type local:WizardPage}">
+      <Style.Triggers>
+         <Trigger Property="PageType" Value="Blank">
+            <Setter Property="Background" Value="#FFF0F0F0" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="Template" Value="{StaticResource BlankWizardPageTemplate}" />
+         </Trigger>
+         <Trigger Property="PageType" Value="Exterior">
+            <Setter Property="Background" Value="#FFFFFF" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="ExteriorPanelBackground" Value="#E3EFFF" />
+            <Setter Property="Template" Value="{StaticResource ExteriorWizardPageTemplate}" />
+         </Trigger>
+         <Trigger Property="PageType" Value="Interior">
+            <Setter Property="Background" Value="#FFF0F0F0" />
+            <Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
+            <Setter Property="BorderThickness" Value="0,1,0,0" />
+            <Setter Property="HeaderBackground" Value="#FFFFFF" />
+            <Setter Property="Template" Value="{StaticResource InteriorWizardPageTemplate}" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/App.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/App.xaml
index b6483ed1..343f1cdd 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/App.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/App.xaml
@@ -1,8 +1,26 @@
-<Application x:Class="WPFToolkit.Extended.Examples.App"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<Application x:Class="WPFToolkit.Extended.Examples.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     StartupUri="Window1.xaml">
-    <Application.Resources>
-         
-    </Application.Resources>
+   <Application.Resources>
+
+   </Application.Resources>
 </Application>
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/App.xaml.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/App.xaml.cs
index 490ee2d0..7d15341d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/App.xaml.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/App.xaml.cs
@@ -1,16 +1,29 @@
-using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
 
 namespace WPFToolkit.Extended.Examples
 {
-    /// <summary>
-    /// Interaction logic for App.xaml
-    /// </summary>
-    public partial class App : Application
-    {
-    }
+  /// <summary>
+  /// Interaction logic for App.xaml
+  /// </summary>
+  public partial class App : Application
+  {
+  }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Properties/AssemblyInfo.cs
index af4eebe1..73326049 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Properties/AssemblyInfo.cs
@@ -1,25 +1,41 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Windows;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("WPFToolkit.Extended.Examples")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("WPFToolkit.Extended.Examples")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "WPFToolkit.Extended.Examples" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "Microsoft" )]
+[assembly: AssemblyProduct( "WPFToolkit.Extended.Examples" )]
+[assembly: AssemblyCopyright( "Copyright © Microsoft 2010" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible( false )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -33,11 +49,11 @@ using System.Windows;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -51,5 +67,5 @@ 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("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion( "1.0.0.0" )]
+[assembly: AssemblyFileVersion( "1.0.0.0" )]
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml
index 0d32a68e..73f50895 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml
@@ -1,9 +1,29 @@
-<Window x:Class="WPFToolkit.Extended.Examples.Window1"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<Window x:Class="WPFToolkit.Extended.Examples.Window1"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:extToolkit="http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended" 
-        Title="Window1" Height="300" Width="300">
-    <Grid>
-        
-    </Grid>
+        Title="Window1"
+        Height="300"
+        Width="300">
+   <Grid>
+
+   </Grid>
 </Window>
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml.cs
index 8dbcfd3a..6f2ed5c4 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended.Examples/Window1.xaml.cs
@@ -1,33 +1,39 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
 using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using 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 WPFToolkit.Extended.Examples
 {
-    /// <summary>
-    /// Interaction logic for Window1.xaml
-    /// </summary>
-    public partial class Window1 : Window
+  /// <summary>
+  /// Interaction logic for Window1.xaml
+  /// </summary>
+  public partial class Window1 : Window
+  {
+    public Window1()
     {
-        public Window1()
-        {
-            InitializeComponent();
-            Loaded += new RoutedEventHandler(Window1_Loaded);            
-        }
+      InitializeComponent();
+      Loaded += new RoutedEventHandler( Window1_Loaded );
+    }
 
-        void Window1_Loaded(object sender, RoutedEventArgs e)
-        {
+    void Window1_Loaded( object sender, RoutedEventArgs e )
+    {
 
-        }
     }
+  }
 }
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml
index d73f6104..97e87c08 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/BusyIndicator/Themes/Generic.xaml
@@ -1,144 +1,162 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="clr-namespace:System;assembly=mscorlib"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls">
 
-    <!-- =============================================================================== -->
-    <!-- BusyIndicator                                                                   -->
-    <!-- =============================================================================== -->
+   <!-- =============================================================================== -->
+   <!-- BusyIndicator                                                                   -->
+   <!-- =============================================================================== -->
 
-    <Style TargetType="{x:Type local:BusyIndicator}">
-        <Setter Property="BusyContent" Value="Please wait..."/>
-        <Setter Property="IsTabStop" Value="False"/>
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="OverlayStyle">
-            <Setter.Value>
-                <Style TargetType="Rectangle">
-                    <Setter Property="Fill" Value="White"/>
-                    <Setter Property="Opacity" Value="0.5"/>
-                </Style>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ProgressBarStyle">
-            <Setter.Value>
-                <Style TargetType="ProgressBar">
-                    <Setter Property="IsIndeterminate" Value="True"/>
-                    <Setter Property="Height" Value="15"/>
-                    <Setter Property="Margin" Value="8,0,8,8"/>
-                </Style>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="DisplayAfter" Value="00:00:00.1"/>
-        <Setter Property="HorizontalAlignment" Value="Stretch"/>
-        <Setter Property="VerticalAlignment" Value="Stretch"/>
-        <Setter Property="HorizontalContentAlignment" Value="Stretch"/>
-        <Setter Property="VerticalContentAlignment" Value="Stretch"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:BusyIndicator}">
-                    <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="VisibilityStates">
-                                <VisualState x:Name="Hidden">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Collapsed</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Visible">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="BusyStatusStates">
-                                <VisualState x:Name="Idle">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <sys:Boolean>True</sys:Boolean>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Busy">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <sys:Boolean>False</sys:Boolean>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <ContentControl x:Name="content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsTabStop="False" Focusable="False"/>
-                        <Rectangle x:Name="overlay" Style="{TemplateBinding OverlayStyle}"/>
-                        <ContentPresenter x:Name="busycontent">
-                            <ContentPresenter.Content>
-                                <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
-                                    <Border Background="White" BorderThickness="1" CornerRadius="2">
-                                        <Border.BorderBrush>
-                                            <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                                <GradientStop Color="#FFA3AEB9" Offset="0"/>
-                                                <GradientStop Color="#FF8399A9" Offset="0.375"/>
-                                                <GradientStop Color="#FF718597" Offset="0.375"/>
-                                                <GradientStop Color="#FF617584" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Border.BorderBrush>
-                                        <Border CornerRadius="1.5" Margin="1">
-                                            <Border.Background>
-                                                <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
-                                                    <GradientStop Color="#FFF6F8F9" Offset="0.02"/>
-                                                    <GradientStop Color="#FFB8B8B8" Offset="0.996"/>
-                                                </LinearGradientBrush>
-                                            </Border.Background>
-                                            <Grid MinWidth="150">
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition/>
-                                                    <RowDefinition Height="Auto"/>
-                                                </Grid.RowDefinitions>
-                                                <ContentControl Content="{TemplateBinding BusyContent}" ContentTemplate="{TemplateBinding BusyContentTemplate}" Margin="8"/>
-                                                <ProgressBar Grid.Row="1" Style="{TemplateBinding ProgressBarStyle}"/>
-                                            </Grid>
-                                        </Border>
-                                    </Border>
-                                </Grid>
-                            </ContentPresenter.Content>
-                        </ContentPresenter>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style TargetType="{x:Type local:BusyIndicator}">
+      <Setter Property="BusyContent" Value="Please wait..." />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="OverlayStyle">
+         <Setter.Value>
+            <Style TargetType="Rectangle">
+               <Setter Property="Fill" Value="White" />
+               <Setter Property="Opacity" Value="0.5" />
+            </Style>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="ProgressBarStyle">
+         <Setter.Value>
+            <Style TargetType="ProgressBar">
+               <Setter Property="IsIndeterminate" Value="True" />
+               <Setter Property="Height" Value="15" />
+               <Setter Property="Margin" Value="8,0,8,8" />
+            </Style>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="DisplayAfter" Value="00:00:00.1" />
+      <Setter Property="HorizontalAlignment" Value="Stretch" />
+      <Setter Property="VerticalAlignment" Value="Stretch" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Stretch" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:BusyIndicator}">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="VisibilityStates">
+                        <VisualState x:Name="Hidden">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Collapsed</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Visible">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="busycontent" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="overlay" Storyboard.TargetProperty="(UIElement.Visibility)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                     <VisualStateGroup x:Name="BusyStatusStates">
+                        <VisualState x:Name="Idle">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <sys:Boolean>True</sys:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Busy">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.001" Storyboard.TargetName="content" Storyboard.TargetProperty="(Control.IsEnabled)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <sys:Boolean>False</sys:Boolean>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <ContentControl x:Name="content" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" IsTabStop="False" Focusable="False" />
+                  <Rectangle x:Name="overlay" Style="{TemplateBinding OverlayStyle}" />
+                  <ContentPresenter x:Name="busycontent">
+                     <ContentPresenter.Content>
+                        <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+                           <Border Background="White" BorderThickness="1" CornerRadius="2">
+                              <Border.BorderBrush>
+                                 <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                    <GradientStop Color="#FFA3AEB9" Offset="0" />
+                                    <GradientStop Color="#FF8399A9" Offset="0.375" />
+                                    <GradientStop Color="#FF718597" Offset="0.375" />
+                                    <GradientStop Color="#FF617584" Offset="1" />
+                                 </LinearGradientBrush>
+                              </Border.BorderBrush>
+                              <Border CornerRadius="1.5" Margin="1">
+                                 <Border.Background>
+                                    <LinearGradientBrush StartPoint="0.5,0" EndPoint="0.5,1">
+                                       <GradientStop Color="#FFF6F8F9" Offset="0.02" />
+                                       <GradientStop Color="#FFB8B8B8" Offset="0.996" />
+                                    </LinearGradientBrush>
+                                 </Border.Background>
+                                 <Grid MinWidth="150">
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition />
+                                       <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <ContentControl Content="{TemplateBinding BusyContent}" ContentTemplate="{TemplateBinding BusyContentTemplate}" Margin="8" />
+                                    <ProgressBar Grid.Row="1" Style="{TemplateBinding ProgressBarStyle}" />
+                                 </Grid>
+                              </Border>
+                           </Border>
+                        </Grid>
+                     </ContentPresenter.Content>
+                  </ContentPresenter>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
index f92640a3..cbcec02e 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ButtonSpinner/Themes/Generic.xaml
@@ -1,71 +1,90 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes">
 
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="../../Themes/Generic/Glyphs.xaml" />
-    </ResourceDictionary.MergedDictionaries>
-
-    <!-- =============================================================================== -->
-    <!-- ButtonSpinner                                                                   -->
-    <!-- =============================================================================== -->
-
-    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-    <Style TargetType="{x:Type local:ButtonSpinner}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
-        <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="IsTabStop" Value="True" />
-        <Setter Property="Padding" Value="2" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:ButtonSpinner}">
-                    <Grid SnapsToDevicePixels="True">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*" />
-                            <ColumnDefinition Width="Auto" />
-                        </Grid.ColumnDefinitions>
-
-                        <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" />
-
-                        <ContentPresenter Focusable="False" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
-
-                        <Grid Grid.Column="1" Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-
-                            <RepeatButton x:Name="PART_IncreaseButton"
-                                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                                              IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource IncreaseGlyphNormalKey}" />
-
-                            <RepeatButton x:Name="PART_DecreaseButton" Grid.Row="1"
-                                              Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
-                                              IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" />
-
-                        </Grid>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
-                        </Trigger>
-                        <Trigger SourceName="PART_IncreaseButton" Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_IncreaseButton" Property="ContentTemplate" Value="{StaticResource IncreaseGlyphDisabledKey}" />
-                        </Trigger>
-                        <Trigger SourceName="PART_DecreaseButton" Property="IsEnabled" Value="False">
-                            <Setter TargetName="PART_DecreaseButton" Property="ContentTemplate" Value="{StaticResource DecreaseGlyphDisabledKey}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="../../Themes/Generic/Glyphs.xaml" />
+   </ResourceDictionary.MergedDictionaries>
+
+   <!-- =============================================================================== -->
+   <!-- ButtonSpinner                                                                   -->
+   <!-- =============================================================================== -->
+
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+
+   <Style TargetType="{x:Type local:ButtonSpinner}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBackgroundKey}}" />
+      <Setter Property="BorderBrush" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlNormalBorderKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="IsTabStop" Value="True" />
+      <Setter Property="Padding" Value="2" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ButtonSpinner}">
+               <Grid SnapsToDevicePixels="True">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="*" />
+                     <ColumnDefinition Width="Auto" />
+                  </Grid.ColumnDefinitions>
+
+                  <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Grid.ColumnSpan="2" />
+
+                  <ContentPresenter Focusable="False" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" />
+
+                  <Grid Grid.Column="1" Visibility="{TemplateBinding ShowButtonSpinner, Converter={StaticResource BooleanToVisibilityConverter}}" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="*" />
+                     </Grid.RowDefinitions>
+
+                     <RepeatButton x:Name="PART_IncreaseButton"
+                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource IncreaseGlyphNormalKey}" />
+
+                     <RepeatButton x:Name="PART_DecreaseButton"
+                                   Grid.Row="1"
+                                   Style="{DynamicResource {x:Static themes:ResourceKeys.SpinnerButtonStyleKey}}"
+                                   IsTabStop="{TemplateBinding IsTabStop}" ContentTemplate="{StaticResource DecreaseGlyphNormalKey}" />
+
+                  </Grid>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Background" Value="{DynamicResource {x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}}" />
+                  </Trigger>
+                  <Trigger SourceName="PART_IncreaseButton" Property="IsEnabled" Value="False">
+                     <Setter TargetName="PART_IncreaseButton" Property="ContentTemplate" Value="{StaticResource IncreaseGlyphDisabledKey}" />
+                  </Trigger>
+                  <Trigger SourceName="PART_DecreaseButton" Property="IsEnabled" Value="False">
+                     <Setter TargetName="PART_DecreaseButton" Property="ContentTemplate" Value="{StaticResource DecreaseGlyphDisabledKey}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml
index 37529ff7..bd37b1dc 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Calculator/Themes/Generic.xaml
@@ -1,496 +1,518 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
-                    xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters" >
-
-    <coreConverters:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
-
-    <Style x:Key="CalculatorOperatorButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="Foreground" Value="#FF5B636E"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid x:Name="Control">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5"/>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="MemoryStates">
-                                <VisualState x:Name="EmptyMemory"/>
-                                <VisualState x:Name="MemoryAssigned">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Border1" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Border2" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Border Background="White" BorderBrush="{x:Null}" BorderThickness="0" CornerRadius="2" Margin="0,0,0,-1" Opacity="0.5"/>
-                        <Grid x:Name="PART_Default">
-                            <Border BorderThickness="0" CornerRadius="2" Background="#FF9CA2AB">
-                                <Grid>
-                                    <Border x:Name="PART_Border1" BorderThickness="0" CornerRadius="1" Margin="1">
-                                        <Border.Background>
-                                            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                                <GradientStop Color="#FFEDF1F7" Offset="0"/>
-                                                <GradientStop Color="#FFD5DBE3" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Border.Background>
-                                        <Border BorderThickness="0" CornerRadius="1" Margin="2">
-                                            <Border.Background>
-                                                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                                    <GradientStop Color="#FFEDF1F7" Offset="0"/>
-                                                    <GradientStop Color="#FFD5DBE3" Offset="1"/>
-                                                </LinearGradientBrush>
-                                            </Border.Background>
-                                        </Border>
-                                    </Border>
-                                    <Border x:Name="PART_Border2" BorderThickness="0" CornerRadius="1" Margin="1" Opacity="0">
-                                        <Border.Background>
-                                            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                                <GradientStop Color="#FF9CA2AB" Offset="0"/>
-                                                <GradientStop Color="#FF9CA2AB" Offset="1"/>
-                                            </LinearGradientBrush>
-                                        </Border.Background>
-                                        <Border BorderThickness="0" CornerRadius="1" Margin="2">
-                                            <Border.Background>
-                                                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                                    <GradientStop Color="#FFEDF1F7" Offset="0"/>
-                                                    <GradientStop Color="#FFD5DBE3" Offset="1"/>
-                                                </LinearGradientBrush>
-                                            </Border.Background>
-                                        </Border>
-                                    </Border>
-                                </Grid>
-                            </Border>
-                        </Grid>
-                        <Grid x:Name="PART_MouseOver" Opacity="0">
-                            <Border BorderThickness="0" CornerRadius="2" Background="#FF9CA2AB">
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1">
-                                    <Border.Background>
-                                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                            <GradientStop Color="#FFFDFEFF" Offset="0"/>
-                                            <GradientStop Color="#FFD9DFE8" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Border.Background>
-                                </Border>
-                            </Border>
-                        </Grid>
-                        <Grid x:Name="PART_Pressed" Opacity="0">
-                            <Border BorderThickness="0" CornerRadius="2" Background="#FF90959D">
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFB5BBC5"/>
-                            </Border>
-                        </Grid>
-                        <ContentPresenter x:Name="contentPresenter"
-							HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-							SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="CalculatorClearButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Focusable" Value="False"/>
-        <Setter Property="Foreground" Value="#FFBF5254"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid x:Name="Control">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5"/>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Border Background="White" BorderBrush="{x:Null}" BorderThickness="0" CornerRadius="2" Margin="0,0,0,-1" Opacity="0.5"/>
-                        <Grid x:Name="PART_Default">
-                            <Border BorderThickness="0" CornerRadius="2">
-                                <Border.Background>
+                    xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
+
+   <coreConverters:CalculatorMemoryToVisibilityConverter x:Key="CalculatorMemoryToVisibilityConverter" />
+
+   <Style x:Key="CalculatorOperatorButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="#FF5B636E" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid x:Name="Control">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Disabled">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                     <VisualStateGroup x:Name="MemoryStates">
+                        <VisualState x:Name="EmptyMemory" />
+                        <VisualState x:Name="MemoryAssigned">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Border1" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Border2" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border Background="White" BorderBrush="{x:Null}" BorderThickness="0" CornerRadius="2" Margin="0,0,0,-1" Opacity="0.5" />
+                  <Grid x:Name="PART_Default">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF9CA2AB">
+                        <Grid>
+                           <Border x:Name="PART_Border1" BorderThickness="0" CornerRadius="1" Margin="1">
+                              <Border.Background>
+                                 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                    <GradientStop Color="#FFEDF1F7" Offset="0" />
+                                    <GradientStop Color="#FFD5DBE3" Offset="1" />
+                                 </LinearGradientBrush>
+                              </Border.Background>
+                              <Border BorderThickness="0" CornerRadius="1" Margin="2">
+                                 <Border.Background>
                                     <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                        <GradientStop Color="#FFC19497" Offset="0"/>
-                                        <GradientStop Color="#FFA67D80" Offset="1"/>
+                                       <GradientStop Color="#FFEDF1F7" Offset="0" />
+                                       <GradientStop Color="#FFD5DBE3" Offset="1" />
                                     </LinearGradientBrush>
-                                </Border.Background>
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1">
-                                    <Border.Background>
-                                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                            <GradientStop Color="#FFFDB8B8" Offset="0"/>
-                                            <GradientStop Color="#FFF39998" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Border.Background>
-                                </Border>
-                            </Border>
-                        </Grid>
-                        <Grid x:Name="PART_MouseOver" Opacity="0">
-                            <Border BorderThickness="0" CornerRadius="2">
-                                <Border.Background>
+                                 </Border.Background>
+                              </Border>
+                           </Border>
+                           <Border x:Name="PART_Border2" BorderThickness="0" CornerRadius="1" Margin="1" Opacity="0">
+                              <Border.Background>
+                                 <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                    <GradientStop Color="#FF9CA2AB" Offset="0" />
+                                    <GradientStop Color="#FF9CA2AB" Offset="1" />
+                                 </LinearGradientBrush>
+                              </Border.Background>
+                              <Border BorderThickness="0" CornerRadius="1" Margin="2">
+                                 <Border.Background>
                                     <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                        <GradientStop Color="#FFC19497" Offset="0"/>
-                                        <GradientStop Color="#FFA67D80" Offset="1"/>
+                                       <GradientStop Color="#FFEDF1F7" Offset="0" />
+                                       <GradientStop Color="#FFD5DBE3" Offset="1" />
                                     </LinearGradientBrush>
-                                </Border.Background>
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1">
-                                    <Border.Background>
-                                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                            <GradientStop Color="#FFFEC9C9" Offset="0"/>
-                                            <GradientStop Color="#FFEAA4A3" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Border.Background>
-                                </Border>
-                            </Border>
-                        </Grid>
-                        <Grid x:Name="PART_Pressed" Opacity="0">
-                            <Border BorderThickness="0" CornerRadius="2" Background="#FF9B6F72">
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFE69197"/>
-                            </Border>
-                        </Grid>
-                        <ContentPresenter x:Name="contentPresenter"
-							HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-							SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="CalculatorDigitButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Foreground" Value="#FF2A313A"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid x:Name="Control">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1"/>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5"/>
-                                        <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5"/>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Border BorderBrush="{x:Null}" BorderThickness="0" Background="White" CornerRadius="3" Margin="0,0,0,-1" Opacity="0.5"/>
-                        <Grid x:Name="PART_Default">
-                            <Border BorderThickness="0" CornerRadius="2">
-                                <Border.Background>
-                                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                        <GradientStop Color="#FFA9AAAB" Offset="0"/>
-                                        <GradientStop Color="#FF98999A" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Border.Background>
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1">
-                                    <Border.Background>
-                                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                            <GradientStop Color="#FFF6F7F7" Offset="0"/>
-                                            <GradientStop Color="#FFDEE0E2" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Border.Background>
-                                </Border>
-                            </Border>
-                        </Grid>
-                        <Grid x:Name="PART_MouseOver" Opacity="0">
-                            <Border BorderThickness="0" CornerRadius="2">
-                                <Border.Background>
-                                    <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                        <GradientStop Color="#FFA9AAAB" Offset="0"/>
-                                        <GradientStop Color="#FF98999A" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Border.Background>
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1">
-                                    <Border.Background>
-                                        <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                                            <GradientStop Color="#FFFCFCFC" Offset="0"/>
-                                            <GradientStop Color="#FFEEEFF2" Offset="1"/>
-                                        </LinearGradientBrush>
-                                    </Border.Background>
-                                </Border>
-                            </Border>
-                        </Grid>
-                        <Grid x:Name="PART_Pressed" Opacity="0">
-                            <Border BorderThickness="0" CornerRadius="2" Background="#FF87888A">
-                                <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFB5BBC5"/>
-                            </Border>
-                        </Grid>
-                        <ContentPresenter x:Name="contentPresenter"
-							HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-							VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-							SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-
-    <ControlTemplate x:Key="CalculatorButtonPanel" TargetType="{x:Type ContentControl}">
-        <Grid>
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="3"/>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="3"/>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="3"/>
-                <ColumnDefinition/>
-                <ColumnDefinition Width="3"/>
-                <ColumnDefinition/>
-            </Grid.ColumnDefinitions>
-            <Grid.RowDefinitions>
-                <RowDefinition/>
-                <RowDefinition Height="3"/>
-                <RowDefinition/>
-                <RowDefinition Height="3"/>
-                <RowDefinition/>
-                <RowDefinition Height="3"/>
-                <RowDefinition/>
-                <RowDefinition Height="3"/>
-                <RowDefinition/>
-                <RowDefinition Height="3"/>
-                <RowDefinition/>
-            </Grid.RowDefinitions>
-            <Button Grid.Column="0" Grid.Row="0" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="MC"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="2" Grid.Row="0" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="MR" 
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="0" Grid.Row="2" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Back" 
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}" Grid.RowSpan="1"/>
-
-            <Button Grid.Column="2" Grid.Row="2" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Cancel" 
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorClearButtonStyle}"/>
-
-            <Button Grid.Column="4" Grid.Row="2" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Clear"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorClearButtonStyle}" Grid.ColumnSpan="1" Grid.RowSpan="1"/>
-
-            <Button Grid.Column="4" Grid.Row="0" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="MS"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="6" Grid.Row="0" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="MAdd"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}" Margin="0"/>
-
-            <Button Grid.Column="8" Grid.Row="0" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="MSub"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="6" Grid.Row="2" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Negate"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="8" Grid.Row="2" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Sqrt"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="0" Grid.Row="4" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Seven"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="2" Grid.Row="4" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Eight"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="4" Grid.Row="4" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Nine"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="6" Grid.Row="4" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Divide"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="8" Grid.Row="4" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Percent"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="0" Grid.Row="6" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Four"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="2" Grid.Row="6" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Five"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="4" Grid.Row="6" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Six"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="6" Grid.Row="6" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Multiply"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="8" Grid.Row="6" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Fraction"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="0" Grid.Row="8" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="One"
-					Command="local:CalculatorCommands.CalculatorButtonClick"                                    
-					Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="2" Grid.Row="8" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Two"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="4" Grid.Row="8" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Three"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}"/>
-
-            <Button Grid.Column="6" Grid.Row="8" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Subtract"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="8" Grid.Row="8" Grid.RowSpan="3" MinWidth="28" MinHeight="55"
-					local:Calculator.CalculatorButtonType="Equal"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-
-            <Button Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="3" MinWidth="59" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Zero"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="4" Grid.Row="10" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Decimal"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorDigitButtonStyle}" />
-
-            <Button Grid.Column="6" Grid.Row="10" MinWidth="28" MinHeight="26"
-					local:Calculator.CalculatorButtonType="Add"
-					Command="local:CalculatorCommands.CalculatorButtonClick"
-					Style="{StaticResource CalculatorOperatorButtonStyle}"/>
-        </Grid>
-    </ControlTemplate>
-
-    <Style TargetType="{x:Type local:Calculator}">
-        <Setter Property="Background">
-            <Setter.Value>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="#FFFAFBFB" Offset="0"/>
-                    <GradientStop Color="#FFF4F4F4" Offset="1"/>
-                </LinearGradientBrush>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="BorderBrush" Value="#FF949494" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="FocusVisualStyle" Value="{x:Null}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:Calculator}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="3">
-                        <Grid Margin="10">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="*" />
-                            </Grid.RowDefinitions>
-                            <Border x:Name="PART_Display" Margin="0,0,0,10" Background="White" BorderBrush="#FF949494" BorderThickness="1">
-                                <StackPanel>
-                                    <Path Stretch="Fill" Height="9" Width="9" Fill="DarkGray"
-                                          Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
-                                          HorizontalAlignment="Left" VerticalAlignment="Top"                                              
-                                          Margin="4,4,0,0"
-                                          Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}"/>
-                                    <TextBlock FontSize="18"
-                                               HorizontalAlignment="Right"
-                                               Margin="0,0,4,0"
-                                               Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" />
-                                </StackPanel>
-                            </Border>
-                            <ContentControl x:Name="PART_CalculatorButtonPanel" Grid.Row="1" Template="{StaticResource CalculatorButtonPanel}" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
+                                 </Border.Background>
+                              </Border>
+                           </Border>
                         </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="PART_Display" Property="Background" Value="#E7F5FF" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_MouseOver" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF9CA2AB">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFDFEFF" Offset="0" />
+                                 <GradientStop Color="#FFD9DFE8" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_Pressed" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF90959D">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFB5BBC5" />
+                     </Border>
+                  </Grid>
+                  <ContentPresenter x:Name="contentPresenter"
+							               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="CalculatorClearButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="#FFBF5254" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid x:Name="Control">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Disabled">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border Background="White" BorderBrush="{x:Null}" BorderThickness="0" CornerRadius="2" Margin="0,0,0,-1" Opacity="0.5" />
+                  <Grid x:Name="PART_Default">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFC19497" Offset="0" />
+                              <GradientStop Color="#FFA67D80" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFDB8B8" Offset="0" />
+                                 <GradientStop Color="#FFF39998" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_MouseOver" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFC19497" Offset="0" />
+                              <GradientStop Color="#FFA67D80" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFEC9C9" Offset="0" />
+                                 <GradientStop Color="#FFEAA4A3" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_Pressed" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF9B6F72">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFE69197" />
+                     </Border>
+                  </Grid>
+                  <ContentPresenter x:Name="contentPresenter"
+							               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="CalculatorDigitButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="#FF2A313A" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid x:Name="Control">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_MouseOver" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To="0" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Pressed" Storyboard.TargetProperty="Opacity" To="1" />
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Disabled">
+                           <Storyboard>
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="PART_Default" Storyboard.TargetProperty="Opacity" To=".5" />
+                              <DoubleAnimation Duration="0" Storyboard.TargetName="contentPresenter" Storyboard.TargetProperty="Opacity" To=".5" />
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border BorderBrush="{x:Null}" BorderThickness="0" Background="White" CornerRadius="3" Margin="0,0,0,-1" Opacity="0.5" />
+                  <Grid x:Name="PART_Default">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFA9AAAB" Offset="0" />
+                              <GradientStop Color="#FF98999A" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFF6F7F7" Offset="0" />
+                                 <GradientStop Color="#FFDEE0E2" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_MouseOver" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2">
+                        <Border.Background>
+                           <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                              <GradientStop Color="#FFA9AAAB" Offset="0" />
+                              <GradientStop Color="#FF98999A" Offset="1" />
+                           </LinearGradientBrush>
+                        </Border.Background>
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1">
+                           <Border.Background>
+                              <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+                                 <GradientStop Color="#FFFCFCFC" Offset="0" />
+                                 <GradientStop Color="#FFEEEFF2" Offset="1" />
+                              </LinearGradientBrush>
+                           </Border.Background>
+                        </Border>
+                     </Border>
+                  </Grid>
+                  <Grid x:Name="PART_Pressed" Opacity="0">
+                     <Border BorderThickness="0" CornerRadius="2" Background="#FF87888A">
+                        <Border BorderThickness="0" CornerRadius="1" Margin="1" Background="#FFB5BBC5" />
+                     </Border>
+                  </Grid>
+                  <ContentPresenter x:Name="contentPresenter"
+							               HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+							               VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+							               SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+
+   <ControlTemplate x:Key="CalculatorButtonPanel" TargetType="{x:Type ContentControl}">
+      <Grid>
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+            <ColumnDefinition Width="3" />
+            <ColumnDefinition />
+         </Grid.ColumnDefinitions>
+         <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+            <RowDefinition Height="3" />
+            <RowDefinition />
+         </Grid.RowDefinitions>
+         <Button Grid.Column="0" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MC"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MR" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Back" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" Grid.RowSpan="1" />
+
+         <Button Grid.Column="2" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Cancel" 
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorClearButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Clear"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorClearButtonStyle}" Grid.ColumnSpan="1" Grid.RowSpan="1" />
+
+         <Button Grid.Column="4" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MS"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MAdd"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" Margin="0" />
+
+         <Button Grid.Column="8" Grid.Row="0" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="MSub"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Negate"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="2" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Sqrt"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Seven"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Eight"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Nine"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Divide"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="4" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Percent"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Four"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Five"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Six"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Multiply"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="6" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Fraction"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="One"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"                                    
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="2" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Two"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Three"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="8" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Subtract"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="8" Grid.Row="8" Grid.RowSpan="3" MinWidth="28" MinHeight="55"
+					  local:Calculator.CalculatorButtonType="Equal"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+
+         <Button Grid.Column="0" Grid.Row="10" Grid.ColumnSpan="3" MinWidth="59" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Zero"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="4" Grid.Row="10" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Decimal"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorDigitButtonStyle}" />
+
+         <Button Grid.Column="6" Grid.Row="10" MinWidth="28" MinHeight="26"
+					  local:Calculator.CalculatorButtonType="Add"
+					  Command="local:CalculatorCommands.CalculatorButtonClick"
+					  Style="{StaticResource CalculatorOperatorButtonStyle}" />
+      </Grid>
+   </ControlTemplate>
+
+   <Style TargetType="{x:Type local:Calculator}">
+      <Setter Property="Background">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+               <GradientStop Color="#FFFAFBFB" Offset="0" />
+               <GradientStop Color="#FFF4F4F4" Offset="1" />
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderBrush" Value="#FF949494" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:Calculator}">
+               <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       CornerRadius="3">
+                  <Grid Margin="10">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="*" />
+                     </Grid.RowDefinitions>
+                     <Border x:Name="PART_Display" Margin="0,0,0,10" Background="White" BorderBrush="#FF949494" BorderThickness="1">
+                        <StackPanel>
+                           <Path Stretch="Fill"
+                                 Height="9"
+                                 Width="9"
+                                 Fill="DarkGray"
+                                 Data="F1 M 508.172,390L 506.031,390L 504.612,393.385C 504.174,394.477 503.788,395.533 503.453,396.555L 503.417,396.555C 503.334,395.528 503.206,394.471 503.035,393.385L 502.454,390L 500.301,390L 498.637,399L 500.226,399L 500.807,395.537C 500.903,394.973 501,394.379 501.099,393.756C 501.198,393.133 501.287,392.534 501.367,391.957L 501.402,391.957C 501.444,392.514 501.499,393.08 501.567,393.655C 501.635,394.231 501.712,394.776 501.8,395.292L 502.382,398.871L 503.7,398.871L 505.231,395.233C 505.445,394.724 505.663,394.187 505.884,393.622C 506.105,393.057 506.313,392.502 506.508,391.957L 506.543,391.957C 506.411,393.11 506.304,394.292 506.223,395.502L 505.979,399L 507.637,399L 508.172,390 Z "
+                                 HorizontalAlignment="Left"
+                                 VerticalAlignment="Top"                                              
+                                 Margin="4,4,0,0"
+                                 Visibility="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource CalculatorMemoryToVisibilityConverter}}" />
+                           <TextBlock FontSize="18"
+                                      HorizontalAlignment="Right"
+                                      Margin="0,0,4,0"
+                                      Text="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </StackPanel>
+                     </Border>
+                     <ContentControl x:Name="PART_CalculatorButtonPanel" Grid.Row="1" Template="{StaticResource CalculatorButtonPanel}" DataContext="{Binding RelativeSource={RelativeSource TemplatedParent}}" />
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsFocused" Value="True">
+                     <Setter TargetName="PART_Display" Property="Background" Value="#E7F5FF" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
index 7ed5e0ce..8e8485fa 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CalculatorUpDown/Themes/Generic.xaml
@@ -1,126 +1,154 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <Style x:Key="CalculatorToggleButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Grid SnapsToDevicePixels="True">
-                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                             CornerRadius="0,2.75,2.75,0"
-                                             RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
-                                             RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
-											 RenderMouseOver="{TemplateBinding IsMouseOver}"
-											 RenderPressed="{TemplateBinding IsPressed}" >
-
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-
-                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
-                                    <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                </Grid>
-                            </Grid>
-                        </chrome:ButtonChrome>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
-    </DataTemplate>
-
-    <!-- =============================================================================== -->
-    <!-- CalculatorUpDown                                                                -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:CalculatorUpDown}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-        <Setter Property="BorderThickness" Value="1,1,0,1" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Right" />
-        <Setter Property="TextAlignment" Value="Right" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:CalculatorUpDown}">
-                    <Grid>
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="Auto" />
-                            </Grid.ColumnDefinitions>
-                            <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
-                                         AllowSpin="{TemplateBinding AllowSpin}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                                <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0" 
-                                                        Background="Transparent"
-                                                        ContextMenu="{TemplateBinding ContextMenu}"
-                                                        FontFamily="{TemplateBinding FontFamily}" 
-                                                        FontSize="{TemplateBinding FontSize}" 
-                                                        FontStretch="{TemplateBinding FontStretch}"
-                                                        FontStyle="{TemplateBinding FontStyle}" 
-                                                        FontWeight="{TemplateBinding FontWeight}" 
-                                                        Foreground="{TemplateBinding Foreground}" 
-                                                        HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                        IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                                                        MinWidth="20" 
-                                                        AcceptsReturn="False"
-                                                        Padding="0"
-                                                        TextAlignment="{TemplateBinding TextAlignment}"
-                                                        TextWrapping="NoWrap" 
-                                                        TabIndex="{TemplateBinding TabIndex}"
-                                                        Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                                        Watermark="{TemplateBinding Watermark}"
-                                                        WatermarkTemplate="{TemplateBinding WatermarkTemplate}"/>
-                            </local:ButtonSpinner>
-                            <ToggleButton x:Name="_calculatorToggleButton" Grid.Column="1"
-                                          IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                                          Style="{StaticResource CalculatorToggleButtonStyle}"
-                                          IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"/>
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="CalculatorToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0,2.75,2.75,0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CalculatorUpDown}}"
+											      RenderMouseOver="{TemplateBinding IsMouseOver}"
+											      RenderPressed="{TemplateBinding IsPressed}">
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
                         </Grid>
-                        <Popup x:Name="PART_CalculatorPopup" IsOpen="{Binding IsChecked, ElementName=_calculatorToggleButton}" StaysOpen="False">
-                            <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
-                                <StackPanel>
-                                    <local:Calculator x:Name="PART_Calculator" Background="Transparent" BorderThickness="0"
-                                                      DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
-                                                      Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
-                                                      Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}"
-                                                      Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}" />
-                                </StackPanel>
-                            </Border>
-                        </Popup>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                     </Grid>
+                  </chrome:ButtonChrome>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <!-- =============================================================================== -->
+   <!-- CalculatorUpDown                                                                -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:CalculatorUpDown}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CalculatorUpDown}">
+               <Grid>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                     </Grid.ColumnDefinitions>
+                     <local:ButtonSpinner x:Name="Spinner"
+                                          IsTabStop="False"
+                                          Background="{TemplateBinding Background}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          AllowSpin="{TemplateBinding AllowSpin}"
+                                          ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                        <local:WatermarkTextBox x:Name="TextBox"
+                                                BorderThickness="0" 
+                                                Background="Transparent"
+                                                ContextMenu="{TemplateBinding ContextMenu}"
+                                                FontFamily="{TemplateBinding FontFamily}" 
+                                                FontSize="{TemplateBinding FontSize}" 
+                                                FontStretch="{TemplateBinding FontStretch}"
+                                                FontStyle="{TemplateBinding FontStyle}" 
+                                                FontWeight="{TemplateBinding FontWeight}" 
+                                                Foreground="{TemplateBinding Foreground}" 
+                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                MinWidth="20"
+                                                AcceptsReturn="False"
+                                                Padding="0"
+                                                TextAlignment="{TemplateBinding TextAlignment}"
+                                                TextWrapping="NoWrap" 
+                                                TabIndex="{TemplateBinding TabIndex}"
+                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                Watermark="{TemplateBinding Watermark}"
+                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                     </local:ButtonSpinner>
+                     <ToggleButton x:Name="_calculatorToggleButton"
+                                   Grid.Column="1"
+                                   IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                   Style="{StaticResource CalculatorToggleButtonStyle}"
+                                   IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                  </Grid>
+                  <Popup x:Name="PART_CalculatorPopup"
+                         IsOpen="{Binding IsChecked, ElementName=_calculatorToggleButton}"
+                         StaysOpen="False">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                        <StackPanel>
+                           <local:Calculator x:Name="PART_Calculator"
+                                             Background="Transparent"
+                                             BorderThickness="0"
+                                             DisplayText="{Binding DisplayText, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Memory="{Binding Memory, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Precision="{Binding Precision, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}" />
+                        </StackPanel>
+                     </Border>
+                  </Popup>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml
index 6b9fb502..bfd76e9a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckComboBox/Themes/Generic.xaml
@@ -1,90 +1,108 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
-                    xmlns:primitives="clr-namespace:Microsoft.Windows.Controls.Primitives" >
+                    xmlns:primitives="clr-namespace:Microsoft.Windows.Controls.Primitives">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-    <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF707070"/>
+   <SolidColorBrush x:Key="ButtonNormalBorder" Color="#FF707070" />
 
-    <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+   <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
 
-    <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="IsTabStop" Value="false"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ToggleButton}">
-                    <chrome:ButtonChrome x:Name="Chrome"
-                                         BorderBrush="{TemplateBinding BorderBrush}" 
-                                         Background="{TemplateBinding Background}"
-                                         CornerRadius="0"
-                                         RenderEnabled="{TemplateBinding IsEnabled}"
-                                         RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
-                                         RenderNormal="False"
-                                         RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}"
-                                         SnapsToDevicePixels="true" >
-                        <Grid HorizontalAlignment="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
-                            <Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="Black" HorizontalAlignment="Center" Margin="3,0,3,0" VerticalAlignment="Center"/>
-                        </Grid>
-                    </chrome:ButtonChrome>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsChecked" Value="true">
-                            <Setter Property="RenderPressed" TargetName="Chrome" Value="true"/>
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}">
+      <Setter Property="OverridesDefaultStyle" Value="true" />
+      <Setter Property="IsTabStop" Value="false" />
+      <Setter Property="Focusable" Value="false" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ToggleButton}">
+               <chrome:ButtonChrome x:Name="Chrome"
+                                    BorderBrush="{TemplateBinding BorderBrush}" 
+                                    Background="{TemplateBinding Background}"
+                                    CornerRadius="0"
+                                    RenderEnabled="{TemplateBinding IsEnabled}"
+                                    RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
+                                    RenderNormal="False"
+                                    RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}"
+                                    SnapsToDevicePixels="true">
+                  <Grid HorizontalAlignment="Right" Width="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}">
+                     <Path x:Name="Arrow" Data="{StaticResource DownArrowGeometry}" Fill="Black" HorizontalAlignment="Center" Margin="3,0,3,0" VerticalAlignment="Center" />
+                  </Grid>
+               </chrome:ButtonChrome>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsChecked" Value="true">
+                     <Setter Property="RenderPressed" TargetName="Chrome" Value="true" />
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter Property="Fill" TargetName="Arrow" Value="#AFAFAF" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
-    <Style TargetType="{x:Type local:CheckComboBox}">
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource ButtonNormalBorder}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/>
-        <Setter Property="Padding" Value="2"/>
-        <Setter Property="ScrollViewer.CanContentScroll" Value="true"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
-                    <Grid x:Name="MainGrid" SnapsToDevicePixels="true">
-                        <Grid.ColumnDefinitions>
-                            <ColumnDefinition Width="*"/>
-                            <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0"/>
-                        </Grid.ColumnDefinitions>
-                        <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" StaysOpen="False" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
-                            <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
-                                <Border x:Name="DropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
-                                    <ScrollViewer x:Name="DropDownScrollViewer">
-                                        <Grid>
-                                            <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
-                                                <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}"/>
-                                            </Canvas>
-                                            <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"/>
-                                        </Grid>
-                                    </ScrollViewer>
-                                </Border>
-                            </Grid>
-                        </Popup>
+   <Style TargetType="{x:Type local:CheckComboBox}">
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderBrush" Value="{StaticResource ButtonNormalBorder}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+      <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+      <Setter Property="Padding" Value="2" />
+      <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
+      <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CheckComboBox}">
+               <Grid x:Name="MainGrid" SnapsToDevicePixels="true">
+                  <Grid.ColumnDefinitions>
+                     <ColumnDefinition Width="*" />
+                     <ColumnDefinition MinWidth="{DynamicResource {x:Static SystemParameters.VerticalScrollBarWidthKey}}" Width="0" />
+                  </Grid.ColumnDefinitions>
+                  <Popup x:Name="PART_Popup" AllowsTransparency="true" Grid.ColumnSpan="2" IsOpen="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" StaysOpen="False" Margin="1" PopupAnimation="{DynamicResource {x:Static SystemParameters.ComboBoxPopupAnimationKey}}" Placement="Bottom">
+                     <Grid MinWidth="{Binding ActualWidth, ElementName=MainGrid}">
+                        <Border x:Name="DropDownBorder" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}" BorderThickness="1" Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}">
+                           <ScrollViewer x:Name="DropDownScrollViewer">
+                              <Grid>
+                                 <Canvas HorizontalAlignment="Left" Height="0" VerticalAlignment="Top" Width="0">
+                                    <Rectangle x:Name="OpaqueRect" Fill="{Binding Background, ElementName=DropDownBorder}" Height="{Binding ActualHeight, ElementName=DropDownBorder}" Width="{Binding ActualWidth, ElementName=DropDownBorder}" />
+                                 </Canvas>
+                                 <ItemsPresenter x:Name="ItemsPresenter" KeyboardNavigation.DirectionalNavigation="Contained" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                              </Grid>
+                           </ScrollViewer>
+                        </Border>
+                     </Grid>
+                  </Popup>
 
-                        <Border Grid.ColumnSpan="2" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"/>
-                        <TextBox Text="{TemplateBinding Text}" IsReadOnly="True" BorderThickness="0" Background="Transparent" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden"/>
-                        <ToggleButton x:Name="PART_DropDownButton" Grid.Column="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"
-                                      IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                  <Border Grid.ColumnSpan="2" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" />
+                  <TextBox Text="{TemplateBinding Text}" IsReadOnly="True" BorderThickness="0" Background="Transparent" Margin="{TemplateBinding Padding}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
+                  <ToggleButton x:Name="PART_DropDownButton" Grid.Column="1" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}" IsChecked="{Binding IsDropDownOpen, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" Style="{StaticResource ComboBoxToggleButton}"
+                                IsHitTestVisible="{Binding IsDropDownOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml
index b4460574..614874e2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CheckListBox/Themes/Generic.xaml
@@ -1,26 +1,44 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <Style TargetType="{x:Type local:CheckListBox}">
-        <Setter Property="BorderBrush" Value="#FF707070" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="KeyboardNavigation.TabNavigation" Value="Once"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:CheckListBox}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <ScrollViewer  Padding="{TemplateBinding Padding}"  VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
-                            <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                        </ScrollViewer>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style TargetType="{x:Type local:CheckListBox}">
+      <Setter Property="BorderBrush" Value="#FF707070" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="KeyboardNavigation.TabNavigation" Value="Once" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CheckListBox}">
+               <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <ScrollViewer Padding="{TemplateBinding Padding}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto">
+                     <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  </ScrollViewer>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml
index 6b8fea5f..8db4170d 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ChildWindow/Themes/Generic.xaml
@@ -1,211 +1,239 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                     xmlns:local="clr-namespace:Microsoft.Windows.Controls">
-
-    <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="0.479" Color="#FFf4f5f6"/>
-                <GradientStop Offset="1" Color="#FFd0d6db"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFb5bdc8"/>
-                <GradientStop Offset="0.370" Color="#FF8399a9"/>
-                <GradientStop Offset="0.370" Color="#FF718597"/>
-                <GradientStop Offset="0.906" Color="#FFb9c1ca"/>
-                <GradientStop Offset="1" Color="#FFb9c1ca"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FF6b7c8d"/>
-                <GradientStop Offset="0.370" Color="#FF4d606f"/>
-                <GradientStop Offset="0.370" Color="#FF465460"/>
-                <GradientStop Offset="0.906" Color="#FF262d33"/>
-                <GradientStop Offset="1" Color="#FF262d33"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="#FF000000"/>
-        <Setter Property="Padding" Value="3"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}"></DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}"></DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
-                            <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0"/>
-                        </Border>
-                        <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                        <Path x:Name="path"
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls">
+
+   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFb5bdc8" />
+            <GradientStop Offset="0.370" Color="#FF8399a9" />
+            <GradientStop Offset="0.370" Color="#FF718597" />
+            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
+            <GradientStop Offset="1" Color="#FFb9c1ca" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FF6b7c8d" />
+            <GradientStop Offset="0.370" Color="#FF4d606f" />
+            <GradientStop Offset="0.370" Color="#FF465460" />
+            <GradientStop Offset="0.906" Color="#FF262d33" />
+            <GradientStop Offset="1" Color="#FF262d33" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
+      <Setter Property="Foreground" Value="#FF000000" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Button">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
+                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                  <Path x:Name="path"
 								Height="6"
 								Width="7"
 								Stretch="Fill"
 								Opacity="1"
 								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
-								Fill="White" Margin="0,0,0,1" Visibility="Collapsed" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- =============================================================================== -->
-    <!-- ChildWindow                                                                      -->
-    <!-- =============================================================================== -->
-
-    <SolidColorBrush x:Key="ChildWindowMainBrushColor" Color="#FF3C688D"/>
-    <LinearGradientBrush x:Key="BorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#7FFFFFFF" Offset="0.05"/>
-        <GradientStop Color="#B2FFFFFF" Offset="0.07"/>
-        <GradientStop Color="#00FFFFFF" Offset="1"/>
-    </LinearGradientBrush>
-
-    <Style TargetType="{x:Type local:ChildWindow}">
-        <Setter Property="Background" Value="#FFFFFFFF"/>
-        <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CaptionForeground" Value="#FF000000" />
-        <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
-        <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
-        <Setter Property="WindowOpacity" Value="1.0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:ChildWindow}">
-                    <Grid x:Name="Root">
-                        <Grid.Resources>
-                            <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-                            <Style x:Key="FocusVisualStyle" TargetType="Control">
-                                <Setter Property="BorderBrush" Value="Black"/>
-                                <Setter Property="Background" Value="Transparent"/>
-                                <Setter Property="Margin" Value="-1"/>
-                                <Setter Property="Template">
-                                    <Setter.Value>
-                                        <ControlTemplate>
-                                            <Rectangle Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" Margin="{TemplateBinding Margin}" StrokeDashArray="4 3" StrokeThickness="0.5">
-                                                <Rectangle.RenderTransform>
-                                                    <TranslateTransform X="{Binding Left}" Y="{Binding Top}"/>
-                                                </Rectangle.RenderTransform>
-                                            </Rectangle>
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                        </Grid.Resources>
-
-                        <Grid x:Name="PART_WindowRoot" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" >
-                            <Grid.RenderTransform>
-                                <TransformGroup>
-                                    <ScaleTransform />
-                                    <SkewTransform />
-                                    <RotateTransform />
-                                    <TranslateTransform />
-                                </TransformGroup>
-                            </Grid.RenderTransform>
-
-                            <!-- Borders -->
-                            <Grid  x:Name="WindowGrid">
-                                <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}"/>
-                                <Grid Margin="0" Background="{x:Null}">
-                                    <Border x:Name="WindowBorder" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}"/>
-                                    <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7"/>
-                                </Grid>
-                            </Grid>
-
-                            <Grid>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" MinHeight="26"/>
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-
-                                <!-- Content Border -->
-                                <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition/>
-                                        <RowDefinition Height="Auto" />
-                                    </Grid.RowDefinitions>
-                                    <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1"/>
-                                    <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
-
-                                        <ContentPresenter x:Name="Content"  Content="{TemplateBinding Content}" 
-                                                              ContentTemplate="{TemplateBinding ContentTemplate}" />
-                                    </Border>
-                                </Grid>
-
-                                <!-- Header -->
-                                <Border x:Name="PART_DragWidget" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
-                                    <Grid>
-                                        <Grid x:Name="CaptionHeader"  Margin="1,1,105,0" VerticalAlignment="Center">
-                                            <!-- Caption -->
-                                            <ContentControl x:Name="Caption" Margin="5,0,0,0" IsTabStop="False" HorizontalAlignment="Stretch"
-                                                        Content="{TemplateBinding Caption}"
-                                                        Foreground="{TemplateBinding CaptionForeground}"/>
-
-                                        </Grid>
-                                    </Grid>
-                                </Border>
-                            </Grid>
-
-                            <!-- Buttons -->
-                            <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
-                                <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Visibility="{TemplateBinding CloseButtonVisibility}" Height="17" Width="43" IsTabStop="False">
-                                    <Path Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Width="12" Fill="#E4FFFFFF" Stretch="Fill" Stroke="#FF535666" 
-                                      Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z"/>
-                                </Button>
-                            </Border>
+								Fill="White"
+                        Margin="0,0,0,1"
+                        Visibility="Collapsed" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- ChildWindow                                                                      -->
+   <!-- =============================================================================== -->
+
+   <SolidColorBrush x:Key="ChildWindowMainBrushColor" Color="#FF3C688D" />
+   <LinearGradientBrush x:Key="BorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#7FFFFFFF" Offset="0.05" />
+      <GradientStop Color="#B2FFFFFF" Offset="0.07" />
+      <GradientStop Color="#00FFFFFF" Offset="1" />
+   </LinearGradientBrush>
+
+   <Style TargetType="{x:Type local:ChildWindow}">
+      <Setter Property="Background" Value="#FFFFFFFF" />
+      <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="CaptionForeground" Value="#FF000000" />
+      <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="VerticalContentAlignment" Value="Top" />
+      <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
+      <Setter Property="WindowOpacity" Value="1.0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ChildWindow}">
+               <Grid x:Name="Root">
+                  <Grid.Resources>
+                     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+                     <Style x:Key="FocusVisualStyle" TargetType="Control">
+                        <Setter Property="BorderBrush" Value="Black" />
+                        <Setter Property="Background" Value="Transparent" />
+                        <Setter Property="Margin" Value="-1" />
+                        <Setter Property="Template">
+                           <Setter.Value>
+                              <ControlTemplate>
+                                 <Rectangle Stroke="{TemplateBinding BorderBrush}" Fill="{TemplateBinding Background}" Margin="{TemplateBinding Margin}" StrokeDashArray="4 3" StrokeThickness="0.5">
+                                    <Rectangle.RenderTransform>
+                                       <TranslateTransform X="{Binding Left}" Y="{Binding Top}" />
+                                    </Rectangle.RenderTransform>
+                                 </Rectangle>
+                              </ControlTemplate>
+                           </Setter.Value>
+                        </Setter>
+                     </Style>
+                  </Grid.Resources>
+
+                  <Grid x:Name="PART_WindowRoot" HorizontalAlignment="Left" VerticalAlignment="Top" MinWidth="{TemplateBinding MinWidth}" MinHeight="{TemplateBinding MinHeight}" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
+                     <Grid.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform />
+                           <SkewTransform />
+                           <RotateTransform />
+                           <TranslateTransform />
+                        </TransformGroup>
+                     </Grid.RenderTransform>
+
+                     <!-- Borders -->
+                     <Grid  x:Name="WindowGrid">
+                        <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                        <Grid Margin="0" Background="{x:Null}">
+                           <Border x:Name="WindowBorder" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                           <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7" />
+                        </Grid>
+                     </Grid>
+
+                     <Grid>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" MinHeight="26" />
+                           <RowDefinition />
+                        </Grid.RowDefinitions>
+
+                        <!-- Content Border -->
+                        <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
+                           <Grid.RowDefinitions>
+                              <RowDefinition />
+                              <RowDefinition Height="Auto" />
+                           </Grid.RowDefinitions>
+                           <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1" />
+                           <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+                              <ContentPresenter x:Name="Content"
+                                                Content="{TemplateBinding Content}" 
+                                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+                           </Border>
                         </Grid>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="WindowState" Value="Closed">
-                            <Setter Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+
+                        <!-- Header -->
+                        <Border x:Name="PART_DragWidget" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
+                           <Grid>
+                              <Grid x:Name="CaptionHeader" Margin="1,1,105,0" VerticalAlignment="Center">
+                                 <!-- Caption -->
+                                 <ContentControl x:Name="Caption"
+                                                 Margin="5,0,0,0"
+                                                 IsTabStop="False"
+                                                 HorizontalAlignment="Stretch"
+                                                 Content="{TemplateBinding Caption}"
+                                                 Foreground="{TemplateBinding CaptionForeground}" />
+                              </Grid>
+                           </Grid>
+                        </Border>
+                     </Grid>
+
+                     <!-- Buttons -->
+                     <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
+                        <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Visibility="{TemplateBinding CloseButtonVisibility}" Height="17" Width="43" IsTabStop="False">
+                           <Path Height="10"
+                                 HorizontalAlignment="Center"
+                                 VerticalAlignment="Center"
+                                 Width="12"
+                                 Fill="#E4FFFFFF"
+                                 Stretch="Fill"
+                                 Stroke="#FF535666" 
+                                 Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z" />
+                        </Button>
+                     </Border>
+                  </Grid>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="WindowState" Value="Closed">
+                     <Setter Property="Visibility" Value="Collapsed" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml
index 3837be05..cf63e8b0 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Chromes/Themes/Generic.xaml
@@ -1,4 +1,22 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
@@ -36,11 +54,11 @@
                   </Border>
 
                   <ContentPresenter Margin="{TemplateBinding Padding}"
-										  IsEnabled="{TemplateBinding IsEnabled}"
-										  Content="{TemplateBinding Content}"
-										  ContentStringFormat="{TemplateBinding ContentStringFormat}"
-										  ContentTemplate="{TemplateBinding ContentTemplate}"
-										  ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+										      IsEnabled="{TemplateBinding IsEnabled}"
+										      Content="{TemplateBinding Content}"
+										      ContentStringFormat="{TemplateBinding ContentStringFormat}"
+										      ContentTemplate="{TemplateBinding ContentTemplate}"
+										      ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
 
                </Grid>
                <ControlTemplate.Triggers>
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml
index 5ff92334..64c2e5e0 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/CollectionEditors/Themes/Generic.xaml
@@ -1,126 +1,162 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:propertyGrid="clr-namespace:Microsoft.Windows.Controls.PropertyGrid">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-    <coreConverters:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
-
-    <Style x:Key="CollectionEditorButtonStyle" TargetType="{x:Type Button}">
-        <Style.Triggers>
-            <Trigger Property="IsEnabled" Value="false">
-                <Setter Property="Opacity" Value="0.6" />
-            </Trigger>
-        </Style.Triggers>
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Height" Value="26" />
-        <Setter Property="Width" Value="26" />
-    </Style>
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <coreConverters:ObjectTypeToNameConverter x:Key="ObjectTypeToNameConverter" />
 
-    <Style TargetType="{x:Type local:CollectionEditor}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:CollectionEditor}">
-                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*" />
-                                <ColumnDefinition Width="1.5*" />
-                            </Grid.ColumnDefinitions>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition />
-                                    <ColumnDefinition Width="Auto" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <TextBlock Margin="0,0,0,5" Text="Select type:" />
-                                <ComboBox x:Name="_newItemTypes" Grid.Row="1" Margin="0,0,0,3" HorizontalAlignment="Stretch"
-                                          ItemsSource="{Binding NewItemTypes, RelativeSource={RelativeSource TemplatedParent}}"
-                                          DisplayMemberPath="Name"
-                                          SelectedIndex="0"/>
-                                <Button Margin="3,0,0,3" Grid.Row="1" Grid.Column="1" Padding="5,0" Content="Add" 
-                                        Command="New" CommandParameter="{Binding SelectedItem, ElementName=_newItemTypes}"  />
-                                <ListBox x:Name="_itemsListBox" Grid.Row="2" Grid.ColumnSpan="2"
-                                         ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
-                                         SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
-                                         SelectedIndex="0">
-                                    <ListBox.ItemTemplate>
-                                        <DataTemplate>
-                                            <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
-                                        </DataTemplate>
-                                    </ListBox.ItemTemplate>
-                                </ListBox>
-                                <StackPanel Margin="7,2,0,0" VerticalAlignment="Top" Grid.Column="2" Grid.Row="2">
-                                    <Button Style="{StaticResource CollectionEditorButtonStyle}"
-                                            Command="ComponentCommands.MoveUp" CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
-                                        <Path Fill="#FF404040" Data="F0 M 6,0 L 12,7 8,7 8,12 4,12 4,7 0,7 Z" />
-                                    </Button>
-                                    <Button Margin="0,1,0,0" Style="{StaticResource CollectionEditorButtonStyle}"
-                                            Command="ComponentCommands.MoveDown" CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
-                                        <Path Fill="#FF404040" Data="F0 M 4,0 L 8,0 8,5 12,5 6,12 0,5 4,5 Z" />
-                                    </Button>
-                                    <Button Margin="0,7,0,0" Style="{StaticResource CollectionEditorButtonStyle}"
-                                            Command="Delete" CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
-                                        <Image Stretch="None" Height="16" Width="16" Margin="1" Source="/WPFToolkit.Extended;component/CollectionEditors/Images/Delete16.png" />
-                                    </Button>
-                                </StackPanel>
-                            </Grid>
-                            <Grid Column="1" Margin="20,0,0,0">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition />
-                                </Grid.RowDefinitions>
-                                <TextBlock Grid.Column="1" Text="Properties:" />
-                                <propertyGrid:PropertyGrid Grid.Row="1" Grid.Column="1" Margin="0,5,0,0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"
-                                                           SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"/>
-                            </Grid>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style x:Key="CollectionEditorButtonStyle" TargetType="{x:Type Button}">
+      <Style.Triggers>
+         <Trigger Property="IsEnabled" Value="false">
+            <Setter Property="Opacity" Value="0.6" />
+         </Trigger>
+      </Style.Triggers>
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Height" Value="26" />
+      <Setter Property="Width" Value="26" />
+   </Style>
 
+   <Style TargetType="{x:Type local:CollectionEditor}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:CollectionEditor}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="1.5*" />
+                     </Grid.ColumnDefinitions>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition />
+                           <ColumnDefinition Width="Auto" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <TextBlock Margin="0,0,0,5" Text="Select type:" />
+                        <ComboBox x:Name="_newItemTypes"
+                                  Grid.Row="1"
+                                  Margin="0,0,0,3"
+                                  HorizontalAlignment="Stretch"
+                                  ItemsSource="{Binding NewItemTypes, RelativeSource={RelativeSource TemplatedParent}}"
+                                  DisplayMemberPath="Name"
+                                  SelectedIndex="0" />
+                        <Button Margin="3,0,0,3"
+                                Grid.Row="1"
+                                Grid.Column="1"
+                                Padding="5,0"
+                                Content="Add" 
+                                Command="New"
+                                CommandParameter="{Binding SelectedItem, ElementName=_newItemTypes}" />
+                        <ListBox x:Name="_itemsListBox"
+                                 Grid.Row="2"
+                                 Grid.ColumnSpan="2"
+                                 ItemsSource="{Binding Items, RelativeSource={RelativeSource TemplatedParent}}"
+                                 SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}"
+                                 SelectedIndex="0">
+                           <ListBox.ItemTemplate>
+                              <DataTemplate>
+                                 <TextBlock Text="{Binding Converter={StaticResource ObjectTypeToNameConverter}}" />
+                              </DataTemplate>
+                           </ListBox.ItemTemplate>
+                        </ListBox>
+                        <StackPanel Margin="7,2,0,0" VerticalAlignment="Top" Grid.Column="2" Grid.Row="2">
+                           <Button Style="{StaticResource CollectionEditorButtonStyle}"
+                                   Command="ComponentCommands.MoveUp"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                              <Path Fill="#FF404040" Data="F0 M 6,0 L 12,7 8,7 8,12 4,12 4,7 0,7 Z" />
+                           </Button>
+                           <Button Margin="0,1,0,0"
+                                   Style="{StaticResource CollectionEditorButtonStyle}"
+                                   Command="ComponentCommands.MoveDown"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                              <Path Fill="#FF404040" Data="F0 M 4,0 L 8,0 8,5 12,5 6,12 0,5 4,5 Z" />
+                           </Button>
+                           <Button Margin="0,7,0,0"
+                                   Style="{StaticResource CollectionEditorButtonStyle}"
+                                   Command="Delete"
+                                   CommandParameter="{Binding SelectedItem, ElementName=_itemsListBox}">
+                              <Image Stretch="None" Height="16" Width="16" Margin="1" Source="/WPFToolkit.Extended;component/CollectionEditors/Images/Delete16.png" />
+                           </Button>
+                        </StackPanel>
+                     </Grid>
+                     <Grid Column="1" Margin="20,0,0,0">
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition />
+                        </Grid.RowDefinitions>
+                        <TextBlock Grid.Column="1" Text="Properties:" />
+                        <propertyGrid:PropertyGrid Grid.Row="1"
+                                                   Grid.Column="1"
+                                                   Margin="0,5,0,0"
+                                                   HorizontalAlignment="Stretch"
+                                                   VerticalAlignment="Stretch"
+                                                   SelectedObject="{Binding SelectedItem, RelativeSource={RelativeSource TemplatedParent}}" />
+                     </Grid>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
-    <Style TargetType="{x:Type local:PrimitiveTypeCollectionEditor}">
-        <Setter Property="BorderBrush">
-            <Setter.Value>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="#FFA3AEB9" Offset="0" />
-                    <GradientStop Color="#FF8399A9" Offset="0.375" />
-                    <GradientStop Color="#FF718597" Offset="0.375" />
-                    <GradientStop Color="#FF617584" Offset="1" />
-                </LinearGradientBrush>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="1,1,0,1" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Padding" Value="2,0,0,0" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:PrimitiveTypeCollectionEditor}">
-                    <local:MultiLineTextEditor Background="{TemplateBinding Background}"
-                                               BorderBrush="{TemplateBinding BorderBrush}"
-                                               BorderThickness="{TemplateBinding BorderThickness}"
-                                               Content="{TemplateBinding Content}"  
-                                               Padding="{TemplateBinding Padding}"
-                                               HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                               IsOpen="{TemplateBinding IsOpen}"
-                                               Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                               VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style TargetType="{x:Type local:PrimitiveTypeCollectionEditor}">
+      <Setter Property="BorderBrush">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+               <GradientStop Color="#FFA3AEB9" Offset="0" />
+               <GradientStop Color="#FF8399A9" Offset="0.375" />
+               <GradientStop Color="#FF718597" Offset="0.375" />
+               <GradientStop Color="#FF617584" Offset="1" />
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Padding" Value="2,0,0,0" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:PrimitiveTypeCollectionEditor}">
+               <local:MultiLineTextEditor Background="{TemplateBinding Background}"
+                                          BorderBrush="{TemplateBinding BorderBrush}"
+                                          BorderThickness="{TemplateBinding BorderThickness}"
+                                          Content="{TemplateBinding Content}"  
+                                          Padding="{TemplateBinding Padding}"
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsOpen="{TemplateBinding IsOpen}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml
index 6cc8d243..62125c4e 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorCanvas/Themes/Generic.xaml
@@ -1,346 +1,403 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <coreConverters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-
-    <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="ColorCanvasBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
-        <DrawingBrush.Drawing>
-            <DrawingGroup>
-                <GeometryDrawing Brush="White">
-                    <GeometryDrawing.Geometry>
-                        <RectangleGeometry Rect="0,0 100,100" />
-                    </GeometryDrawing.Geometry>
-                </GeometryDrawing>
-                <GeometryDrawing Brush="LightGray">
-                    <GeometryDrawing.Geometry>
-                        <GeometryGroup>
-                            <RectangleGeometry Rect="0,0 50,50" />
-                            <RectangleGeometry Rect="50,50 50,50" />
-                        </GeometryGroup>
-                    </GeometryDrawing.Geometry>
-                </GeometryDrawing>
-            </DrawingGroup>
-        </DrawingBrush.Drawing>
-    </DrawingBrush>
-
-    <SolidColorBrush x:Key="HorizontalSliderTrackNormalBackground" Color="#FFE7EAEA"/>
-
-    <LinearGradientBrush x:Key="HorizontalSliderTrackNormalBorder" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#FFAEB1AF" Offset="0.1"/>
-        <GradientStop Color="White" Offset=".9"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="ThumbStroke" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="ThumbFill" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFfefefe"/>
-                <GradientStop Offset="0.5" Color="#FFeff1f2"/>
-                <GradientStop Offset="1" Color="#FFd0d6db"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <SolidColorBrush x:Key="ThumbMouseOver" Color="#FFE5F2F6"/>
-
-    <Style x:Key="ColorCanvasTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
-        <Setter Property="Background" Value="Transparent" />
-        <Style.Triggers>
-            <Trigger Property="IsFocused" Value="False">
-                <Setter Property="BorderBrush" Value="Transparent" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="SliderRepeatButtonStyle"
+   <coreConverters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+   <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="ColorCanvasBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
+      <DrawingBrush.Drawing>
+         <DrawingGroup>
+            <GeometryDrawing Brush="White">
+               <GeometryDrawing.Geometry>
+                  <RectangleGeometry Rect="0,0 100,100" />
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+            <GeometryDrawing Brush="LightGray">
+               <GeometryDrawing.Geometry>
+                  <GeometryGroup>
+                     <RectangleGeometry Rect="0,0 50,50" />
+                     <RectangleGeometry Rect="50,50 50,50" />
+                  </GeometryGroup>
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+         </DrawingGroup>
+      </DrawingBrush.Drawing>
+   </DrawingBrush>
+
+   <SolidColorBrush x:Key="HorizontalSliderTrackNormalBackground" Color="#FFE7EAEA" />
+
+   <LinearGradientBrush x:Key="HorizontalSliderTrackNormalBorder" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#FFAEB1AF" Offset="0.1" />
+      <GradientStop Color="White" Offset=".9" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="ThumbStroke" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="ThumbFill" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFfefefe" />
+            <GradientStop Offset="0.5" Color="#FFeff1f2" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="ThumbMouseOver" Color="#FFE5F2F6" />
+
+   <Style x:Key="ColorCanvasTextBoxStyle" TargetType="TextBox" BasedOn="{StaticResource {x:Type TextBox}}">
+      <Setter Property="Background" Value="Transparent" />
+      <Style.Triggers>
+         <Trigger Property="IsFocused" Value="False">
+            <Setter Property="BorderBrush" Value="Transparent" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="SliderRepeatButtonStyle"
          TargetType="{x:Type RepeatButton}">
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="IsTabStop" Value="false"/>
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RepeatButton}">
-                    <Border Background="{TemplateBinding Background}"/>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="CustomThumbForSlider" TargetType="{x:Type Thumb}">
-        <Setter Property="OverridesDefaultStyle" Value="True"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Rectangle x:Name="_thumb" Fill="{StaticResource ThumbFill}" Stroke="{StaticResource ThumbStroke}" Height="14" Width="8" RadiusX="1" RadiusY="1"/>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="_thumb" Property="Rectangle.Fill" Value="{StaticResource ThumbMouseOver}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="VerticalSlideThumbStyle" TargetType="{x:Type Thumb}">
-        <Setter Property="Focusable" Value="false"/>
-        <Setter Property="OverridesDefaultStyle" Value="true"/>
-        <Setter Property="Height" Value="12"/>
-        <Setter Property="Width" Value="11"/>
-        <Setter Property="Foreground" Value="Gray"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Thumb}">
-                    <Canvas SnapsToDevicePixels="true">
-                        <Path x:Name="LeftArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8" >
-                            <Path.RenderTransform>
-                                <TransformGroup>
-                                    <ScaleTransform/>
-                                    <SkewTransform/>
-                                    <RotateTransform />
-                                    <TranslateTransform Y="6" X="-3"/>
-                                </TransformGroup>
-                            </Path.RenderTransform>
-                        </Path>
-                        <Path x:Name="RightArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8" >
-                            <Path.RenderTransform>
-                                <TransformGroup>
-                                    <ScaleTransform/>
-                                    <SkewTransform/>
-                                    <RotateTransform Angle="-180"/>
-                                    <TranslateTransform Y="6" X="8"/>
-                                </TransformGroup>
-                            </Path.RenderTransform>
-                        </Path>
-                    </Canvas>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ColorCanvasSliderStyle" TargetType="{x:Type Slider}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Slider}">
-                    <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+      <Setter Property="OverridesDefaultStyle" Value="true" />
+      <Setter Property="IsTabStop" Value="false" />
+      <Setter Property="Focusable" Value="false" />
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RepeatButton}">
+               <Border Background="{TemplateBinding Background}" />
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="CustomThumbForSlider" TargetType="{x:Type Thumb}">
+      <Setter Property="OverridesDefaultStyle" Value="True" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Thumb}">
+               <Rectangle x:Name="_thumb" Fill="{StaticResource ThumbFill}" Stroke="{StaticResource ThumbStroke}" Height="14" Width="8" RadiusX="1" RadiusY="1" />
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="_thumb" Property="Rectangle.Fill" Value="{StaticResource ThumbMouseOver}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="VerticalSlideThumbStyle" TargetType="{x:Type Thumb}">
+      <Setter Property="Focusable" Value="false" />
+      <Setter Property="OverridesDefaultStyle" Value="true" />
+      <Setter Property="Height" Value="12" />
+      <Setter Property="Width" Value="11" />
+      <Setter Property="Foreground" Value="Gray" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Thumb}">
+               <Canvas SnapsToDevicePixels="true">
+                  <Path x:Name="LeftArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
+                     <Path.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform />
+                           <SkewTransform />
+                           <RotateTransform />
+                           <TranslateTransform Y="6" X="-3" />
+                        </TransformGroup>
+                     </Path.RenderTransform>
+                  </Path>
+                  <Path x:Name="RightArrow" Stretch="Fill" StrokeLineJoin="Round" Stroke="#FF000000" Fill="#FF000000" Data="F1 M 276.761,316L 262.619,307.835L 262.619,324.165L 276.761,316 Z " RenderTransformOrigin="0.5,0.5" Width="6" Height="8">
+                     <Path.RenderTransform>
+                        <TransformGroup>
+                           <ScaleTransform />
+                           <SkewTransform />
+                           <RotateTransform Angle="-180" />
+                           <TranslateTransform Y="6" X="8" />
+                        </TransformGroup>
+                     </Path.RenderTransform>
+                  </Path>
+               </Canvas>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ColorCanvasSliderStyle" TargetType="{x:Type Slider}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Slider}">
+               <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" SnapsToDevicePixels="true">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+                     <TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Placement="Top" Grid.Row="0" Visibility="Collapsed" />
+                     <TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Placement="Bottom" Grid.Row="2" Visibility="Collapsed" />
+                     <Border x:Name="TrackBackground" BorderBrush="{StaticResource HorizontalSliderTrackNormalBorder}" BorderThickness="1" Background="{StaticResource HorizontalSliderTrackNormalBackground}" CornerRadius="1" Height="4.0" Margin="5,0" Grid.Row="1" VerticalAlignment="center">
+                        <Canvas Margin="-6,-1">
+                           <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" Height="4.0" Stroke="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" StrokeThickness="1.0" Visibility="Hidden" />
+                        </Canvas>
+                     </Border>
+                     <Track x:Name="PART_Track" Grid.Row="1">
+                        <Track.DecreaseRepeatButton>
+                           <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}" />
+                        </Track.DecreaseRepeatButton>
+                        <Track.IncreaseRepeatButton>
+                           <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}" />
+                        </Track.IncreaseRepeatButton>
+                        <Track.Thumb>
+                           <Thumb x:Name="Thumb" Style="{StaticResource CustomThumbForSlider}" />
+                        </Track.Thumb>
+                     </Track>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:ColorCanvas}">
+      <Setter Property="Background" Value="{StaticResource ColorCanvasBackgroundBrush}" />
+      <Setter Property="BorderBrush" Value="{StaticResource ColorPickerDarkBorderBrush}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ColorCanvas}">
+               <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Padding="3">
+                  <Grid Margin="2">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+                     <Grid>
+                        <Grid.ColumnDefinitions >
+                           <ColumnDefinition Width="200" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Grid.RowDefinitions>
+                           <RowDefinition Height="Auto" />
+                           <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
+                        <Border BorderThickness="1" BorderBrush="DarkGray" ClipToBounds="True" Background="{StaticResource CheckerBrush}">
+                           <Canvas x:Name="PART_ColorShadingCanvas" Width="200" Height="100" HorizontalAlignment="Left" VerticalAlignment="Top">
+                              <Rectangle x:Name="ColorShadingRectangle"
+                                         Height="{Binding ElementName=PART_ColorShadingCanvas, Path=Height}"
+                                         Width="{Binding ElementName=PART_ColorShadingCanvas, Path=Width}"
+                                         Fill="{Binding SelectedColor, ElementName=PART_SpectrumSlider, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              <Rectangle x:Name="WhiteGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
+                                 <Rectangle.Fill>
+                                    <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
+                                       <GradientStop Offset="0" Color="#ffffffff" />
+                                       <GradientStop Offset="1" Color="Transparent" />
+                                    </LinearGradientBrush>
+                                 </Rectangle.Fill>
+                              </Rectangle>
+                              <Rectangle x:Name="BlackGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}">
+                                 <Rectangle.Fill>
+                                    <LinearGradientBrush StartPoint="0,1" EndPoint="0, 0">
+                                       <GradientStop Offset="0" Color="#ff000000" />
+                                       <GradientStop Offset="1" Color="#00000000" />
+                                    </LinearGradientBrush>
+                                 </Rectangle.Fill>
+                              </Rectangle>
+                              <Canvas x:Name="PART_ColorShadeSelector" Width="10" Height="10" IsHitTestVisible="False">
+                                 <Ellipse Width="10" Height="10" StrokeThickness="3" Stroke="#FFFFFFFF" IsHitTestVisible="False" />
+                                 <Ellipse Width="10" Height="10" StrokeThickness="1" Stroke="#FF000000" IsHitTestVisible="False" />
+                              </Canvas>
+                           </Canvas>
+                        </Border>
+
+                        <Border Grid.Row="1" Margin="0,5,0,0">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="*" />
+                              </Grid.ColumnDefinitions>
+                              <Border Background="{StaticResource CheckerBrush}" Height="22" Margin="2,0,2,0" BorderThickness="1" BorderBrush="#FFC9CACA">
+                                 <Rectangle x:Name="SelectedColor" Fill="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                              </Border>
+                              <TextBox Grid.Column="1" Text="{Binding HexadecimalString, RelativeSource={RelativeSource TemplatedParent}}" Margin="2,0,2,0" VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}" />
+                           </Grid>
+                        </Border>
+
+                        <Border Grid.Column="1" Grid.RowSpan="2" Margin="4,-8,0,0" ClipToBounds="False">
+                           <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider" VerticalAlignment="Stretch" />
+                        </Border>
+                     </Grid>
+
+                     <Border MinWidth="180" Grid.Row="1" BorderThickness="1" ClipToBounds="True" Margin="0,10,0,0">
                         <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto" MinHeight="{TemplateBinding MinHeight}"/>
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <TickBar x:Name="TopTick" Fill="{TemplateBinding Foreground}" Height="4" Placement="Top" Grid.Row="0" Visibility="Collapsed"/>
-                            <TickBar x:Name="BottomTick" Fill="{TemplateBinding Foreground}" Height="4" Placement="Bottom" Grid.Row="2" Visibility="Collapsed"/>
-                            <Border x:Name="TrackBackground" BorderBrush="{StaticResource HorizontalSliderTrackNormalBorder}" BorderThickness="1" Background="{StaticResource HorizontalSliderTrackNormalBackground}" CornerRadius="1" Height="4.0" Margin="5,0" Grid.Row="1" VerticalAlignment="center">
-                                <Canvas Margin="-6,-1">
-                                    <Rectangle x:Name="PART_SelectionRange" Fill="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" Height="4.0" Stroke="{DynamicResource {x:Static SystemColors.ControlDarkDarkBrushKey}}" StrokeThickness="1.0" Visibility="Hidden"/>
-                                </Canvas>
-                            </Border>
-                            <Track x:Name="PART_Track" Grid.Row="1">
-                                <Track.DecreaseRepeatButton>
-                                    <RepeatButton Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}"/>
-                                </Track.DecreaseRepeatButton>
-                                <Track.IncreaseRepeatButton>
-                                    <RepeatButton Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource SliderRepeatButtonStyle}"/>
-                                </Track.IncreaseRepeatButton>
-                                <Track.Thumb>
-                                    <Thumb x:Name="Thumb" Style="{StaticResource CustomThumbForSlider}"/>
-                                </Track.Thumb>
-                            </Track>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type local:ColorCanvas}">
-        <Setter Property="Background" Value="{StaticResource ColorCanvasBackgroundBrush}" />
-        <Setter Property="BorderBrush" Value="{StaticResource ColorPickerDarkBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:ColorCanvas}">
-                    <Border Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Padding="3">
-                        <Grid Margin="2">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-                            <Grid>
-                                <Grid.ColumnDefinitions >
-                                    <ColumnDefinition Width="200"></ColumnDefinition>
-                                    <ColumnDefinition Width="Auto"></ColumnDefinition>
-                                </Grid.ColumnDefinitions>
-                                <Grid.RowDefinitions>
-                                    <RowDefinition Height="Auto" />
-                                    <RowDefinition Height="Auto"/>
-                                </Grid.RowDefinitions>
-
-                                <Border BorderThickness="1" BorderBrush="DarkGray" ClipToBounds="True" Background="{StaticResource CheckerBrush}">
-                                    <Canvas x:Name="PART_ColorShadingCanvas" Width="200" Height="100" HorizontalAlignment="Left" VerticalAlignment="Top">
-                                        <Rectangle x:Name="ColorShadingRectangle" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}"
-                                                   Fill="{Binding SelectedColor, ElementName=PART_SpectrumSlider, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                                        <Rectangle x:Name="WhiteGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}" >
-                                            <Rectangle.Fill>
-                                                <LinearGradientBrush StartPoint="0,0" EndPoint="1,0">
-                                                    <GradientStop Offset="0" Color="#ffffffff"/>
-                                                    <GradientStop Offset="1" Color="Transparent"/>
-                                                </LinearGradientBrush>
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <Rectangle x:Name="BlackGradient" Width="{Binding ElementName=PART_ColorShadingCanvas,Path=Width}" Height="{Binding ElementName=PART_ColorShadingCanvas,Path=Height}" >
-                                            <Rectangle.Fill>
-                                                <LinearGradientBrush StartPoint="0,1" EndPoint="0, 0">
-                                                    <GradientStop Offset="0" Color="#ff000000"/>
-                                                    <GradientStop Offset="1" Color="#00000000"/>
-                                                </LinearGradientBrush>
-                                            </Rectangle.Fill>
-                                        </Rectangle>
-                                        <Canvas x:Name="PART_ColorShadeSelector" Width="10" Height="10" IsHitTestVisible="False">
-                                            <Ellipse Width="10" Height="10" StrokeThickness="3" Stroke="#FFFFFFFF" IsHitTestVisible="False"  />
-                                            <Ellipse Width="10" Height="10" StrokeThickness="1" Stroke="#FF000000" IsHitTestVisible="False" />
-                                        </Canvas>
-                                    </Canvas>
-                                </Border>
-
-                                <Border Grid.Row="1" Margin="0,5,0,0">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="*" />
-                                        </Grid.ColumnDefinitions>
-                                        <Border Background="{StaticResource CheckerBrush}" Height="22" Margin="2,0,2,0" BorderThickness="1" BorderBrush="#FFC9CACA">
-                                            <Rectangle x:Name="SelectedColor" Fill="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                                        </Border>
-                                        <TextBox Grid.Column="1" Text="{Binding HexadecimalString, RelativeSource={RelativeSource TemplatedParent}}" Margin="2,0,2,0" VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}" />
-                                    </Grid>
-                                </Border>
-
-                                <Border Grid.Column="1" Grid.RowSpan="2" Margin="4,-8,0,0" ClipToBounds="False">
-                                    <local:ColorSpectrumSlider x:Name="PART_SpectrumSlider" VerticalAlignment="Stretch" />
-                                </Border>
-                            </Grid>
-
-                            <Border MinWidth="180" Grid.Row="1" BorderThickness="1" ClipToBounds="True" Margin="0,10,0,0">
-                                <Grid>
-                                    <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                        <RowDefinition Height="Auto"/>
-                                    </Grid.RowDefinitions>
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="Auto"/>
-                                        <ColumnDefinition Width="*"/>
-                                        <ColumnDefinition Width="Auto"/>
-                                    </Grid.ColumnDefinitions>
-
-                                    <TextBlock Grid.Row="0" Grid.Column="0" Text="R"
-                                               VerticalAlignment="Center"/>
-                                    <Slider x:Name="PART_RSlider" Maximum="255" TickFrequency="1" Grid.Row="0" Grid.Column="1" Margin="4,6,4,6"
-                                            Style="{StaticResource ColorCanvasSliderStyle}"
-                                            Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
-                                            VerticalAlignment="Center"/>
-                                    <TextBox Grid.Row="0" Grid.Column="2" Text="{Binding Value, ElementName=PART_RSlider}"
-                                             VerticalAlignment="Center"
-                                             Style="{StaticResource ColorCanvasTextBoxStyle}"/>
-
-                                    <TextBlock Grid.Row="1" Grid.Column="0" Text="G"
-                                               VerticalAlignment="Center"/>
-                                    <Slider x:Name="PART_GSlider" Maximum="255" TickFrequency="1" Grid.Row="1" Grid.Column="1" Margin="4,6,4,6"
-                                            Style="{StaticResource ColorCanvasSliderStyle}"
-                                            Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
-                                            VerticalAlignment="Center"/>
-                                    <TextBox Grid.Row="1" Grid.Column="2" Text="{Binding Value, ElementName=PART_GSlider}"
-                                             VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}"/>
-
-                                    <TextBlock Grid.Row="2" Grid.Column="0" Text="B"
-                                               VerticalAlignment="Center"/>
-                                    <Slider x:Name="PART_BSlider" Maximum="255" TickFrequency="1" Grid.Row="2" Grid.Column="1" Margin="4,6,4,6"
-                                            Style="{StaticResource ColorCanvasSliderStyle}"
-                                            Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
-                                            VerticalAlignment="Center"/>
-                                    <TextBox Grid.Row="2" Grid.Column="3" Text="{Binding Value, ElementName=PART_BSlider}"
-                                             VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}"/>
-
-                                    <TextBlock Grid.Row="3" Grid.Column="0" Text="A"
-                                               VerticalAlignment="Center"/>
-                                    <Slider x:Name="PART_OpacitySlider" Grid.Row="3" Grid.Column="1" Maximum="255" Margin="4,6,4,6"
-                                            Style="{StaticResource ColorCanvasSliderStyle}"
-                                            Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
-                                            VerticalAlignment="Center"/>
-                                    <TextBox Grid.Row="3" Grid.Column="3" Text="{Binding Value, ElementName=PART_OpacitySlider}"
-                                             VerticalAlignment="Center" Style="{StaticResource ColorCanvasTextBoxStyle}"/>
-
-                                </Grid>
-                            </Border>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition Height="Auto" />
+                           </Grid.RowDefinitions>
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="Auto" />
+                              <ColumnDefinition Width="*" />
+                              <ColumnDefinition Width="Auto" />
+                           </Grid.ColumnDefinitions>
+
+                           <TextBlock Grid.Row="0"
+                                      Grid.Column="0"
+                                      Text="R"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_RSlider"
+                                   Maximum="255"
+                                   TickFrequency="1"
+                                   Grid.Row="0"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding R, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="0"
+                                    Grid.Column="2"
+                                    Text="{Binding Value, ElementName=PART_RSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                           <TextBlock Grid.Row="1"
+                                      Grid.Column="0"
+                                      Text="G"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_GSlider"
+                                   Maximum="255"
+                                   TickFrequency="1"
+                                   Grid.Row="1"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding G, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="1"
+                                    Grid.Column="2"
+                                    Text="{Binding Value, ElementName=PART_GSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                           <TextBlock Grid.Row="2"
+                                      Grid.Column="0"
+                                      Text="B"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_BSlider"
+                                   Maximum="255"
+                                   TickFrequency="1"
+                                   Grid.Row="2"
+                                   Grid.Column="1"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding B, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="2"
+                                    Grid.Column="3"
+                                    Text="{Binding Value, ElementName=PART_BSlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
+
+                           <TextBlock Grid.Row="3"
+                                      Grid.Column="0"
+                                      Text="A"
+                                      VerticalAlignment="Center" />
+                           <Slider x:Name="PART_OpacitySlider"
+                                   Grid.Row="3"
+                                   Grid.Column="1"
+                                   Maximum="255"
+                                   Margin="4,6,4,6"
+                                   Style="{StaticResource ColorCanvasSliderStyle}"
+                                   Value="{Binding Path=A, RelativeSource={RelativeSource TemplatedParent}}"
+                                   VerticalAlignment="Center" />
+                           <TextBox Grid.Row="3"
+                                    Grid.Column="3"
+                                    Text="{Binding Value, ElementName=PART_OpacitySlider}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ColorCanvasTextBoxStyle}" />
                         </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type local:ColorSpectrumSlider}">
-        <Setter Property="Orientation" Value="Vertical"/>
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-        <Setter Property="Minimum" Value="1"/>
-        <Setter Property="Maximum" Value="360"/>
-        <Setter Property="TickFrequency" Value="0.001" />
-        <Setter Property="IsSnapToTickEnabled" Value="True" />
-        <Setter Property="IsDirectionReversed" Value="False" />
-        <Setter Property="IsMoveToPointEnabled" Value="True" />
-        <Setter Property="Value" Value="0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:ColorSpectrumSlider}">
-                    <Grid>
-                        <Border x:Name="PART_TrackBackground" BorderBrush="DarkGray" BorderThickness="1" Width="15" Margin="0,8,0,0" >
-                            <Rectangle x:Name="PART_SpectrumDisplay" Stretch="Fill" VerticalAlignment="Stretch" />
-                        </Border>
+                     </Border>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:ColorSpectrumSlider}">
+      <Setter Property="Orientation" Value="Vertical" />
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+      <Setter Property="Minimum" Value="1" />
+      <Setter Property="Maximum" Value="360" />
+      <Setter Property="TickFrequency" Value="0.001" />
+      <Setter Property="IsSnapToTickEnabled" Value="True" />
+      <Setter Property="IsDirectionReversed" Value="False" />
+      <Setter Property="IsMoveToPointEnabled" Value="True" />
+      <Setter Property="Value" Value="0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ColorSpectrumSlider}">
+               <Grid>
+                  <Border x:Name="PART_TrackBackground" BorderBrush="DarkGray" BorderThickness="1" Width="15" Margin="0,8,0,0">
+                     <Rectangle x:Name="PART_SpectrumDisplay" Stretch="Fill" VerticalAlignment="Stretch" />
+                  </Border>
 
-                        <Track Name="PART_Track">
-                            <Track.DecreaseRepeatButton>
-                                <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.DecreaseLarge"/>
-                            </Track.DecreaseRepeatButton>
-                            <Track.IncreaseRepeatButton>
-                                <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.IncreaseLarge"/>
-                            </Track.IncreaseRepeatButton>
-                            <Track.Thumb>
-                                <Thumb Style="{StaticResource VerticalSlideThumbStyle}" />
-                            </Track.Thumb>
-                        </Track>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                  <Track Name="PART_Track">
+                     <Track.DecreaseRepeatButton>
+                        <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.DecreaseLarge" />
+                     </Track.DecreaseRepeatButton>
+                     <Track.IncreaseRepeatButton>
+                        <RepeatButton Style="{StaticResource SliderRepeatButtonStyle}" Command="Slider.IncreaseLarge" />
+                     </Track.IncreaseRepeatButton>
+                     <Track.Thumb>
+                        <Thumb Style="{StaticResource VerticalSlideThumbStyle}" />
+                     </Track.Thumb>
+                  </Track>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml
index 1d566980..f5abdeb5 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/ColorPicker/Themes/Generic.xaml
@@ -1,285 +1,315 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes">
 
-    <SolidColorBrush x:Key="ButtonHover" Color="#C2E0FF"/>
-    <SolidColorBrush x:Key="ButtonHoverBorder" Color="#3399FF"/>
-    <SolidColorBrush x:Key="ButtonChecked" Color="#E6F0FA"/>
-    <SolidColorBrush x:Key="ButtonPressed" Color="#99CCFF"/>
-    <SolidColorBrush x:Key="ButtonPressedBorder" Color="#3399FF"/>
-
-    <!-- =============================================================================== -->
-    <!-- ColorPicker                                                                     -->
-    <!-- =============================================================================== -->
-
-    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-    <coreConverters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
-
-    <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
-        <DrawingBrush.Drawing>
-            <DrawingGroup>
-                <GeometryDrawing Brush="White">
-                    <GeometryDrawing.Geometry>
-                        <RectangleGeometry Rect="0,0 100,100" />
-                    </GeometryDrawing.Geometry>
-                </GeometryDrawing>
-                <GeometryDrawing Brush="LightGray">
-                    <GeometryDrawing.Geometry>
-                        <GeometryGroup>
-                            <RectangleGeometry Rect="0,0 50,50" />
-                            <RectangleGeometry Rect="50,50 50,50" />
-                        </GeometryGroup>
-                    </GeometryDrawing.Geometry>
-                </GeometryDrawing>
-            </DrawingGroup>
-        </DrawingBrush.Drawing>
-    </DrawingBrush>
-
-    <Style x:Key="ColorItemContainerStyle" TargetType="{x:Type ListBoxItem}">
-        <Setter Property="ToolTip" Value="{Binding Name}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <Grid ToolTip="{Binding Name}">
-                        <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
-                        <Border BorderThickness="1" Background="Transparent" BorderBrush="Transparent" x:Name="_outerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
-                            <Border Background="Transparent" BorderThickness="1" BorderBrush="Transparent" x:Name="_innerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+   <SolidColorBrush x:Key="ButtonHover" Color="#C2E0FF" />
+   <SolidColorBrush x:Key="ButtonHoverBorder" Color="#3399FF" />
+   <SolidColorBrush x:Key="ButtonChecked" Color="#E6F0FA" />
+   <SolidColorBrush x:Key="ButtonPressed" Color="#99CCFF" />
+   <SolidColorBrush x:Key="ButtonPressedBorder" Color="#3399FF" />
+
+   <!-- =============================================================================== -->
+   <!-- ColorPicker                                                                     -->
+   <!-- =============================================================================== -->
+
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <coreConverters:ColorToSolidColorBrushConverter x:Key="ColorToSolidColorBrushConverter" />
+
+   <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <DrawingBrush  x:Key="CheckerBrush" Viewport="0,0,10,10" ViewportUnits="Absolute" TileMode="Tile">
+      <DrawingBrush.Drawing>
+         <DrawingGroup>
+            <GeometryDrawing Brush="White">
+               <GeometryDrawing.Geometry>
+                  <RectangleGeometry Rect="0,0 100,100" />
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+            <GeometryDrawing Brush="LightGray">
+               <GeometryDrawing.Geometry>
+                  <GeometryGroup>
+                     <RectangleGeometry Rect="0,0 50,50" />
+                     <RectangleGeometry Rect="50,50 50,50" />
+                  </GeometryGroup>
+               </GeometryDrawing.Geometry>
+            </GeometryDrawing>
+         </DrawingGroup>
+      </DrawingBrush.Drawing>
+   </DrawingBrush>
+
+   <Style x:Key="ColorItemContainerStyle" TargetType="{x:Type ListBoxItem}">
+      <Setter Property="ToolTip" Value="{Binding Name}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type ListBoxItem}">
+               <Grid ToolTip="{Binding Name}">
+                  <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
+                  <Border BorderThickness="1" Background="Transparent" BorderBrush="Transparent" x:Name="_outerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                     <Border Background="Transparent" BorderThickness="1" BorderBrush="Transparent" x:Name="_innerBorder" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
+                     <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
+                     <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <DataTemplate x:Key="ColorItemTemplate">
+      <Grid>
+         <Border BorderBrush="#FFC9CACA" BorderThickness="1" Margin="2,2,2,2" >
+            <Rectangle Width="14" Height="14">
+               <Rectangle.Style>
+                  <Style TargetType="Rectangle">
+                     <Setter Property="Fill" Value="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+                     <Style.Triggers>
+                        <DataTrigger Binding="{Binding Name}" Value="Transparent">
+                           <Setter Property="Fill" Value="{StaticResource CheckerBrush}" />
+                        </DataTrigger>
+                     </Style.Triggers>
+                  </Style>
+               </Rectangle.Style>
+            </Rectangle>
+         </Border>
+      </Grid>
+   </DataTemplate>
+
+   <Style x:Key="ColorPickerToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*"/>
+                        <ColumnDefinition Width="Auto"/>
+                     </Grid.ColumnDefinitions>
+
+                     <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                        <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                     </Border>
+
+                     <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                          Grid.Column="1"
+                                          CornerRadius="0,2.75,2.75,0"
+                                          RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
+                                          RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
+											         RenderMouseOver="{TemplateBinding IsMouseOver}"
+											         RenderPressed="{TemplateBinding IsPressed}">
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                        </Grid>
+                     </chrome:ButtonChrome>
+                  </Grid>
+
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ColorDisplayStyle" TargetType="Border">
+      <Setter Property="Background" Value="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
+      <Style.Triggers>
+         <DataTrigger Binding="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" Value="Transparent">
+            <Setter Property="Background" Value="{StaticResource CheckerBrush}" />
+         </DataTrigger>
+      </Style.Triggers>
+   </Style>
+
+   <Style x:Key="ColorListStyle" TargetType="ListBox">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="0" />
+      <Setter Property="ItemsPanel">
+         <Setter.Value>
+            <ItemsPanelTemplate>
+               <WrapPanel Width="200" />
+            </ItemsPanelTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="ItemContainerStyle" Value="{StaticResource ColorItemContainerStyle}" />
+      <Setter Property="ItemTemplate" Value="{StaticResource ColorItemTemplate}" />
+      <Setter Property="SelectionMode" Value="Single" />
+   </Style>
+
+   <Style TargetType="{x:Type local:ColorPicker}">
+      <Setter Property="Background" Value="White" />
+      <Setter Property="BorderBrush" Value="{StaticResource ColorPickerDarkBorderBrush}" />
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="ButtonStyle" Value="{StaticResource ColorPickerToggleButtonStyle}" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Stretch" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:ColorPicker}">
+               <Grid>
+                  <ToggleButton x:Name="PART_ColorPickerToggleButton"
+                                IsTabStop="True"
+                                MinHeight="22" 
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                Padding="{TemplateBinding Padding}"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                Style="{TemplateBinding ButtonStyle}">
+                     <Grid Margin="2">
+                        <Border x:Name="ColorOnly" Style="{StaticResource ColorDisplayStyle}" />
+
+                        <Border x:Name="ColorAndName" Background="White" Visibility="Hidden">
+                           <StackPanel Orientation="Horizontal">
+                              <Border HorizontalAlignment="Left" Width="20" Margin="2,1,4,1" Style="{StaticResource ColorDisplayStyle}" BorderThickness="1" BorderBrush="#FFC9CACA" />
+                              <TextBlock Text="{Binding SelectedColorText, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
+                           </StackPanel>
                         </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
-                            <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="_outerBorder" Property="BorderBrush" Value="#FFFF0000" />
-                            <Setter TargetName="_innerBorder" Property="BorderBrush" Value="#FFFFFF00" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <DataTemplate x:Key="ColorItemTemplate">
-        <Grid>
-            <Border BorderBrush="#FFC9CACA" BorderThickness="1" Margin="2,2,2,2" >
-                <Rectangle Width="14" Height="14">
-                    <Rectangle.Style>
-                        <Style TargetType="Rectangle">
-                            <Setter Property="Fill" Value="{Binding Color, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding Name}" Value="Transparent">
-                                    <Setter Property="Fill" Value="{StaticResource CheckerBrush}" />
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </Rectangle.Style>
-                </Rectangle>
-            </Border>
-        </Grid>
-    </DataTemplate>
-
-    <Style x:Key="ColorPickerToggleButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Grid SnapsToDevicePixels="True">
+                     </Grid>
+                  </ToggleButton>
 
+                  <Popup x:Name="PART_ColorPickerPalettePopup" VerticalAlignment="Bottom" IsOpen="{Binding ElementName=PART_ColorPickerToggleButton, Path=IsChecked}" StaysOpen="False" AllowsTransparency="True" Focusable="False" HorizontalOffset="1" VerticalOffset="1" PopupAnimation="Slide">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource ColorPickerDarkBorderBrush}" Padding="3">
                         <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-
-                            <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-                                <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-                            </Border>
-
-                            <chrome:ButtonChrome x:Name="ToggleButtonChrome" Grid.Column="1"
-                                             CornerRadius="0,2.75,2.75,0"
-                                            RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
-                                            RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:ColorPicker}}"
-											RenderMouseOver="{TemplateBinding IsMouseOver}"
-											RenderPressed="{TemplateBinding IsPressed}" >
-
-                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
-                                    <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                </Grid>
-                            </chrome:ButtonChrome>
-                        </Grid>
+                           <Grid.RowDefinitions>
+                              <RowDefinition Height="Auto" />
+                              <RowDefinition />
+                              <RowDefinition Height="Auto" />
+                           </Grid.RowDefinitions>
 
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ColorDisplayStyle" TargetType="Border">
-        <Setter Property="Background" Value="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ColorToSolidColorBrushConverter}}" />
-        <Style.Triggers>
-            <DataTrigger Binding="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" Value="Transparent">
-                <Setter Property="Background" Value="{StaticResource CheckerBrush}" />
-            </DataTrigger>
-        </Style.Triggers>
-    </Style>
-
-    <Style x:Key="ColorListStyle" TargetType="ListBox">
-        <Setter Property="Background" Value="Transparent" />
-        <Setter Property="BorderThickness" Value="0" />
-        <Setter Property="ItemsPanel">
-            <Setter.Value>
-                <ItemsPanelTemplate>
-                    <WrapPanel Width="200" />
-                </ItemsPanelTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="ItemContainerStyle" Value="{StaticResource ColorItemContainerStyle}" />
-        <Setter Property="ItemTemplate" Value="{StaticResource ColorItemTemplate}" />
-        <Setter Property="SelectionMode" Value="Single" />
-    </Style>
-
-    <Style TargetType="{x:Type local:ColorPicker}">
-        <Setter Property="Background" Value="White" />
-        <Setter Property="BorderBrush" Value="{StaticResource ColorPickerDarkBorderBrush}" />
-        <Setter Property="BorderThickness" Value="1,1,0,1" />
-        <Setter Property="ButtonStyle" Value="{StaticResource ColorPickerToggleButtonStyle}" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="HorizontalContentAlignment" Value="Stretch" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:ColorPicker}">
-                    <Grid>
-                        <ToggleButton x:Name="PART_ColorPickerToggleButton" IsTabStop="True" MinHeight="22" 
-                                      Background="{TemplateBinding Background}" 
-                                      BorderBrush="{TemplateBinding BorderBrush}" 
-                                      BorderThickness="{TemplateBinding BorderThickness}" 
-                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                      Padding="{TemplateBinding Padding}"
-                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                      Style="{TemplateBinding ButtonStyle}">
-                            <Grid Margin="2">
-                                <Border x:Name="ColorOnly" Style="{StaticResource ColorDisplayStyle}" />
-
-                                <Border x:Name="ColorAndName" Background="White" Visibility="Hidden">
-                                    <StackPanel Orientation="Horizontal">
-                                        <Border HorizontalAlignment="Left" Width="20" Margin="2,1,4,1" Style="{StaticResource ColorDisplayStyle}" BorderThickness="1" BorderBrush="#FFC9CACA" />
-                                        <TextBlock Text="{Binding SelectedColorText, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" />
-                                    </StackPanel>
-                                </Border>
-                            </Grid>
-                        </ToggleButton>
-
-                        <Popup x:Name="PART_ColorPickerPalettePopup"  VerticalAlignment="Bottom" IsOpen="{Binding ElementName=PART_ColorPickerToggleButton, Path=IsChecked}" StaysOpen="False" AllowsTransparency="True" Focusable="False"  HorizontalOffset="1" VerticalOffset="1" PopupAnimation="Slide"  >
-                            <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource ColorPickerDarkBorderBrush}" Padding="3">
-                                <Grid>
+                           <Grid x:Name="_gridStandardColorsHost" Margin="4">
+                              <Grid.RowDefinitions>
+                                 <RowDefinition Height="Auto" />
+                                 <RowDefinition Height="Auto" />
+                                 <RowDefinition Height="Auto" />
+                                 <RowDefinition Height="Auto" />
+                              </Grid.RowDefinitions>
+
+                              <!-- Available Colors -->
+                              <Grid Grid.Row="1" Visibility="{TemplateBinding ShowAvailableColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                 <Grid>
                                     <Grid.RowDefinitions>
-                                        <RowDefinition Height="Auto" />
-                                        <RowDefinition />
-                                        <RowDefinition Height="Auto" />
+                                       <RowDefinition Height="Auto" />
+                                       <RowDefinition />
                                     </Grid.RowDefinitions>
+                                    <TextBlock Text="{TemplateBinding AvailableColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,0,0,1" />
+                                    <ListBox x:Name="PART_AvailableColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Style="{StaticResource ColorListStyle}" />
+                                 </Grid>
+                              </Grid>
 
-                                    <Grid x:Name="_gridStandardColorsHost" Margin="4">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                            <RowDefinition Height="Auto" />
-                                        </Grid.RowDefinitions>
-
-                                        <!-- Available Colors -->
-                                        <Grid Grid.Row="1" Visibility="{TemplateBinding ShowAvailableColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                            <Grid>
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition Height="Auto" />
-                                                    <RowDefinition />
-                                                </Grid.RowDefinitions>
-                                                <TextBlock Text="{TemplateBinding AvailableColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,0,0,1" />
-                                                <ListBox x:Name="PART_AvailableColors" Grid.Row="1"
-                                                         ItemsSource="{Binding AvailableColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                                         Style="{StaticResource ColorListStyle}" />
-                                            </Grid>
-                                        </Grid>
-
-                                        <!-- Standard Colors-->
-                                        <Grid Grid.Row="2" Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                            <Grid>
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition Height="Auto" />
-                                                    <RowDefinition Height="Auto" />
-                                                </Grid.RowDefinitions>
-                                                <TextBlock Text="{TemplateBinding StandardColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1"/>
-                                                <ListBox x:Name="PART_StandardColors" Grid.Row="1"
-                                                         ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"                                                      
-                                                         Style="{StaticResource ColorListStyle}" />
-                                            </Grid>
-                                        </Grid>
-
-                                        <!-- Recent Colors-->
-                                        <Grid Grid.Row="3" Margin="0,1,0,1" Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                            <Grid>
-                                                <Grid.RowDefinitions>
-                                                    <RowDefinition Height="Auto" />
-                                                    <RowDefinition Height="Auto" />
-                                                </Grid.RowDefinitions>
-                                                <TextBlock Text="{TemplateBinding RecentColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1"/>
-                                                <ListBox x:Name="PART_RecentColors" Grid.Row="1"
-                                                         ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
-                                                         Style="{StaticResource ColorListStyle}" />
-                                            </Grid>
-                                        </Grid>
-                                    </Grid>
-
-                                    <!-- ColorCanvas -->
-                                    <Grid x:Name="_colorCanvasHost" Visibility="Collapsed">
-                                        <local:ColorCanvas x:Name="PART_ColorCanvas" Background="Transparent" BorderThickness="0"
-                                                           SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" />
-                                    </Grid>
-
-                                    <Separator Grid.Row="1" HorizontalAlignment="Stretch" Margin="5,0,5,0" />
-
-                                    <!-- More Colors Button -->
-                                    <ToggleButton x:Name="_colorMode" Grid.Row="2" Content="Advanced" Margin="5" Visibility="{TemplateBinding ShowAdvancedButton, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                                </Grid>
-                            </Border>
-                        </Popup>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="DisplayColorAndName" Value="True">
-                            <Setter TargetName="ColorOnly" Property="Visibility" Value="Collapsed" />
-                            <Setter TargetName="ColorAndName" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                        <Trigger SourceName="_colorMode" Property="IsChecked" Value="True">
-                            <Setter TargetName="_colorMode" Property="Content" Value="Standard" />
-                            <Setter TargetName="_colorCanvasHost" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="_gridStandardColorsHost" Property="Visibility" Value="Collapsed" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                              <!-- Standard Colors-->
+                              <Grid Grid.Row="2" Visibility="{TemplateBinding ShowStandardColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                 <Grid>
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition Height="Auto" />
+                                       <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Text="{TemplateBinding StandardColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
+                                    <ListBox x:Name="PART_StandardColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding StandardColors, RelativeSource={RelativeSource TemplatedParent}}"                                                      
+                                             Style="{StaticResource ColorListStyle}" />
+                                 </Grid>
+                              </Grid>
+
+                              <!-- Recent Colors-->
+                              <Grid Grid.Row="3" Margin="0,1,0,1" Visibility="{TemplateBinding ShowRecentColors, Converter={StaticResource BooleanToVisibilityConverter}}">
+                                 <Grid>
+                                    <Grid.RowDefinitions>
+                                       <RowDefinition Height="Auto" />
+                                       <RowDefinition Height="Auto" />
+                                    </Grid.RowDefinitions>
+                                    <TextBlock Text="{TemplateBinding RecentColorsHeader}" Background="AliceBlue" Padding="2" Margin="0,1,0,1" />
+                                    <ListBox x:Name="PART_RecentColors"
+                                             Grid.Row="1"
+                                             ItemsSource="{Binding RecentColors, RelativeSource={RelativeSource TemplatedParent}}"
+                                             Style="{StaticResource ColorListStyle}" />
+                                 </Grid>
+                              </Grid>
+                           </Grid>
+
+                           <!-- ColorCanvas -->
+                           <Grid x:Name="_colorCanvasHost" Visibility="Collapsed">
+                              <local:ColorCanvas x:Name="PART_ColorCanvas"
+                                                 Background="Transparent"
+                                                 BorderThickness="0"
+                                                 SelectedColor="{Binding SelectedColor, RelativeSource={RelativeSource TemplatedParent}}" />
+                           </Grid>
+
+                           <Separator Grid.Row="1" HorizontalAlignment="Stretch" Margin="5,0,5,0" />
+
+                           <!-- More Colors Button -->
+                           <ToggleButton x:Name="_colorMode" Grid.Row="2" Content="Advanced" Margin="5" Visibility="{TemplateBinding ShowAdvancedButton, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                        </Grid>
+                     </Border>
+                  </Popup>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="DisplayColorAndName" Value="True">
+                     <Setter TargetName="ColorOnly" Property="Visibility" Value="Collapsed" />
+                     <Setter TargetName="ColorAndName" Property="Visibility" Value="Visible" />
+                  </Trigger>
+                  <Trigger SourceName="_colorMode" Property="IsChecked" Value="True">
+                     <Setter TargetName="_colorMode" Property="Content" Value="Standard" />
+                     <Setter TargetName="_colorCanvasHost" Property="Visibility" Value="Visible" />
+                     <Setter TargetName="_gridStandardColorsHost" Property="Visibility" Value="Collapsed" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
index 73fe2d93..f69ec1d1 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimePicker/Themes/Generic.xaml
@@ -1,131 +1,155 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters"
                     xmlns:toolkit="http://schemas.microsoft.com/wpf/2008/toolkit">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
-    </DataTemplate>
-
-    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <Style x:Key="DateTimePickerToggleButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Grid SnapsToDevicePixels="True">
-                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                             CornerRadius="0,2.75,2.75,0"
-											RenderMouseOver="{TemplateBinding IsMouseOver}"
-											RenderPressed="{TemplateBinding IsPressed}" />
-
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-
-                            <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                            <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
-                                <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                            </Grid>
-                        </Grid>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- =============================================================================== -->
-    <!-- DateTimePicker                                                                  -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:DateTimePicker}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Right" />
-        <Setter Property="TextAlignment" Value="Right" />
-        <Setter Property="TimeWatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
-                    <Border>
-                        <Grid>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
-                                         AllowSpin="{TemplateBinding AllowSpin}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                                    <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0" 
-                                                Background="Transparent"
-                                                FontFamily="{TemplateBinding FontFamily}" 
-                                                FontSize="{TemplateBinding FontSize}" 
-                                                FontStretch="{TemplateBinding FontStretch}"
-                                                FontStyle="{TemplateBinding FontStyle}" 
-                                                FontWeight="{TemplateBinding FontWeight}" 
-                                                Foreground="{TemplateBinding Foreground}" 
-                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                                                MinWidth="20" 
-                                                AcceptsReturn="False"
-                                                Padding="0"
-                                                TextAlignment="{TemplateBinding TextAlignment}"
-                                                TextWrapping="NoWrap" 
-                                                TabIndex="{TemplateBinding TabIndex}"
-                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Watermark="{TemplateBinding Watermark}"
-                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}"/>
-                                </local:ButtonSpinner>
-                                <ToggleButton x:Name="_calendarToggleButton" Grid.Column="1" Background="White"
-                                              IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                                              Style="{StaticResource DateTimePickerToggleButtonStyle}"
-                                              IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                              IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"/>
-                            </Grid>
-                            <Popup IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}" StaysOpen="False">
-                                <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
-                                    <StackPanel>
-                                        <toolkit:Calendar x:Name="Part_Calendar" BorderThickness="0" />
-                                        <local:TimePicker x:Name="Part_TimeUpDown" 
-                                                          Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
-                                                          Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" 
-                                                          Format="{TemplateBinding TimeFormat}"
-                                                          FormatString="{TemplateBinding TimeFormatString}"
-                                                          Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
-                                                          Watermark="{TemplateBinding TimeWatermark}"
-                                                          WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}"/>
-                                    </StackPanel>
-                                </Border>
-                            </Popup>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="DateTimePickerToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0,2.75,2.75,0"
+											      RenderMouseOver="{TemplateBinding IsMouseOver}"
+											      RenderPressed="{TemplateBinding IsPressed}" />
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                     </Grid.ColumnDefinitions>
+
+                     <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                     <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                        <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                     </Grid>
+                  </Grid>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- DateTimePicker                                                                  -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DateTimePicker}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="TimeWatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DateTimePicker}">
+               <Border>
+                  <Grid>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <local:ButtonSpinner x:Name="Spinner"
+                                             IsTabStop="False"
+                                             Background="{TemplateBinding Background}"
+                                             BorderThickness="{TemplateBinding BorderThickness}"
+                                             AllowSpin="{TemplateBinding AllowSpin}"
+                                             ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                           <local:WatermarkTextBox x:Name="TextBox"
+                                                   BorderThickness="0" 
+                                                   Background="Transparent"
+                                                   FontFamily="{TemplateBinding FontFamily}" 
+                                                   FontSize="{TemplateBinding FontSize}" 
+                                                   FontStretch="{TemplateBinding FontStretch}"
+                                                   FontStyle="{TemplateBinding FontStyle}" 
+                                                   FontWeight="{TemplateBinding FontWeight}" 
+                                                   Foreground="{TemplateBinding Foreground}" 
+                                                   HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                                   IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   MinWidth="20"
+                                                   AcceptsReturn="False"
+                                                   Padding="0"
+                                                   TextAlignment="{TemplateBinding TextAlignment}"
+                                                   TextWrapping="NoWrap" 
+                                                   TabIndex="{TemplateBinding TabIndex}"
+                                                   Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                                   Watermark="{TemplateBinding Watermark}"
+                                                   WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                        </local:ButtonSpinner>
+                        <ToggleButton x:Name="_calendarToggleButton"
+                                      Grid.Column="1"
+                                      Background="White"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource DateTimePickerToggleButtonStyle}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                      IsEnabled="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                     </Grid>
+                     <Popup IsOpen="{Binding IsChecked, ElementName=_calendarToggleButton}" StaysOpen="False">
+                        <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" Padding="3">
+                           <StackPanel>
+                              <toolkit:Calendar x:Name="Part_Calendar" BorderThickness="0" />
+                              <local:TimePicker x:Name="Part_TimeUpDown"
+                                                Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"
+                                                Foreground="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" 
+                                                Format="{TemplateBinding TimeFormat}"
+                                                FormatString="{TemplateBinding TimeFormatString}"
+                                                Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                                Watermark="{TemplateBinding TimeWatermark}"
+                                                WatermarkTemplate="{TemplateBinding TimeWatermarkTemplate}" />
+                           </StackPanel>
+                        </Border>
+                     </Popup>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
index c2539fb1..e455fc53 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DateTimeUpDown/Themes/Generic.xaml
@@ -1,52 +1,75 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls">
 
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
-    </DataTemplate>
-
-    <!-- =============================================================================== -->
-    <!-- DateTimeUpDown                                                                  -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:DateTimeUpDown}">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Right" />
-        <Setter Property="TextAlignment" Value="Right" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
-                    <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
-                                         AllowSpin="{TemplateBinding AllowSpin}" ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
-                        <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0" 
-                                                Background="Transparent"
-                                                ContextMenu="{TemplateBinding ContextMenu}"
-                                                FontFamily="{TemplateBinding FontFamily}" 
-                                                FontSize="{TemplateBinding FontSize}" 
-                                                FontStretch="{TemplateBinding FontStretch}"
-                                                FontStyle="{TemplateBinding FontStyle}" 
-                                                FontWeight="{TemplateBinding FontWeight}" 
-                                                Foreground="{TemplateBinding Foreground}" 
-                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                                                MinWidth="20"
-                                                AcceptsReturn="False"
-                                                Padding="0"
-                                                TextAlignment="{TemplateBinding TextAlignment}"
-                                                TextWrapping="NoWrap" 
-                                                TabIndex="{TemplateBinding TabIndex}"
-                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                                Watermark="{TemplateBinding Watermark}"
-                                                WatermarkTemplate="{TemplateBinding WatermarkTemplate}"/>
-                    </local:ButtonSpinner>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <!-- =============================================================================== -->
+   <!-- DateTimeUpDown                                                                  -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DateTimeUpDown}">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DateTimeUpDown}">
+               <local:ButtonSpinner x:Name="Spinner"
+                                    IsTabStop="False"
+                                    Background="{TemplateBinding Background}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    AllowSpin="{TemplateBinding AllowSpin}"
+                                    ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}">
+                  <local:WatermarkTextBox x:Name="TextBox"
+                                          BorderThickness="0" 
+                                          Background="Transparent"
+                                          ContextMenu="{TemplateBinding ContextMenu}"
+                                          FontFamily="{TemplateBinding FontFamily}" 
+                                          FontSize="{TemplateBinding FontSize}" 
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}" 
+                                          FontWeight="{TemplateBinding FontWeight}" 
+                                          Foreground="{TemplateBinding Foreground}" 
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="0"
+                                          TextAlignment="{TemplateBinding TextAlignment}"
+                                          TextWrapping="NoWrap" 
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          Watermark="{TemplateBinding Watermark}"
+                                          WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+               </local:ButtonSpinner>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml
index f05249a2..2b80da2a 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/DropDownButton/Themes/Generic.xaml
@@ -1,83 +1,102 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters"
-                    xmlns:local="clr-namespace:Microsoft.Windows.Controls" >
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <Style TargetType="{x:Type local:DropDownButton}">
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Padding" Value="3"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:DropDownButton}">
-                    <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
-                        <ToggleButton x:Name="PART_DropDownButton" Grid.Column="1"
-                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" >
-                            <ToggleButton.Template>
-                                <ControlTemplate TargetType="ToggleButton">
-                                    <ContentPresenter />
-                                </ControlTemplate>
-                            </ToggleButton.Template>
-                            <Grid>
-                                <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                                     CornerRadius="2.75"
-                                                    RenderChecked="{TemplateBinding IsOpen}"
-                                                    RenderEnabled="{TemplateBinding IsEnabled}"
-											        RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
-											        RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}" >
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <ContentPresenter Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
-                                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3" Grid.Column="1">
-                                            <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                        </Grid>
-                                    </Grid>
-                                </chrome:ButtonChrome>
-                            </Grid>
-                        </ToggleButton>
+   <Style TargetType="{x:Type local:DropDownButton}">
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:DropDownButton}">
+               <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
+                  <ToggleButton x:Name="PART_DropDownButton"
+                                Grid.Column="1"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+                     <ToggleButton.Template>
+                        <ControlTemplate TargetType="ToggleButton">
+                           <ContentPresenter />
+                        </ControlTemplate>
+                     </ToggleButton.Template>
+                     <Grid>
+                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                             CornerRadius="2.75"
+                                             RenderChecked="{TemplateBinding IsOpen}"
+                                             RenderEnabled="{TemplateBinding IsEnabled}"
+											            RenderMouseOver="{Binding IsMouseOver, ElementName=PART_DropDownButton}"
+											            RenderPressed="{Binding IsPressed, ElementName=PART_DropDownButton}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="Auto" />
+                              </Grid.ColumnDefinitions>
+                              <ContentPresenter Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
+                              <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3" Grid.Column="1">
+                                 <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                              </Grid>
+                           </Grid>
+                        </chrome:ButtonChrome>
+                     </Grid>
+                  </ToggleButton>
 
-                        <Popup x:Name="PART_Popup" 
-                               HorizontalOffset="1"
-                               VerticalOffset="1"
-                               AllowsTransparency="True"
-                               StaysOpen="False"
-                               Placement="Bottom"
-                               Focusable="False"
-                               IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}">
-                            <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" >
-                                <ContentPresenter Content="{TemplateBinding DropDownContent}" />
-                            </Border>
-                        </Popup>
+                  <Popup x:Name="PART_Popup" 
+                         HorizontalOffset="1"
+                         VerticalOffset="1"
+                         AllowsTransparency="True"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         Focusable="False"
+                         IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                        <ContentPresenter Content="{TemplateBinding DropDownContent}" />
+                     </Border>
+                  </Popup>
 
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml
index f039723e..f7c67b2f 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Magnifier/Themes/Generic.xaml
@@ -1,4 +1,22 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:magConverters="clr-namespace:Microsoft.Windows.Controls.Mag.Converters">
@@ -7,26 +25,26 @@
    <!-- Magnifier                                                                       -->
    <!-- =============================================================================== -->
 
-   <magConverters:RadiusConverter x:Key="RadiusConverter"/>
-   <magConverters:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter"/>
+   <magConverters:RadiusConverter x:Key="RadiusConverter" />
+   <magConverters:BorderThicknessToStrokeThicknessConverter x:Key="BorderThicknessToStrokeThicknessConverter" />
 
    <ControlTemplate x:Key="CircleTemplate" TargetType="{x:Type local:Magnifier}">
       <Grid>
          <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="{Binding Path=Radius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource RadiusConverter}}"/>
+            <ColumnDefinition Width="{Binding Path=Radius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource RadiusConverter}}" />
          </Grid.ColumnDefinitions>
          <Grid.RowDefinitions>
-            <RowDefinition Height="{Binding Path=Radius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource RadiusConverter}}"/>
+            <RowDefinition Height="{Binding Path=Radius, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource RadiusConverter}}" />
          </Grid.RowDefinitions>
          <Ellipse Width="{Binding Path=FrameWidth, RelativeSource={RelativeSource TemplatedParent}}" 
                   Height="{Binding Path=FrameHeight, RelativeSource={RelativeSource TemplatedParent}}" 
-                  Fill="{TemplateBinding Background}"/>
+                  Fill="{TemplateBinding Background}" />
          <Ellipse Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}" 
                   StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
             <Ellipse.Fill>
                <VisualBrush Viewbox="{Binding Path=ViewBox, RelativeSource={RelativeSource TemplatedParent}}" 
                             ViewboxUnits="Absolute"
-                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}"/>
+                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}" />
             </Ellipse.Fill>
          </Ellipse>
       </Grid>
@@ -41,21 +59,22 @@
                     Stroke="{Binding Path=BorderBrush, RelativeSource={RelativeSource TemplatedParent}}"
                     StrokeThickness="{Binding Path=BorderThickness, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BorderThicknessToStrokeThicknessConverter}}">
             <Rectangle.Fill>
-               <VisualBrush Viewbox="{Binding Path=ViewBox, RelativeSource={RelativeSource TemplatedParent}}" ViewboxUnits="Absolute"
-                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}"/>
+               <VisualBrush Viewbox="{Binding Path=ViewBox, RelativeSource={RelativeSource TemplatedParent}}"
+                            ViewboxUnits="Absolute"
+                            Visual="{Binding Path=Target, RelativeSource={RelativeSource TemplatedParent}}" />
             </Rectangle.Fill>
          </Rectangle>
       </Canvas>
    </ControlTemplate>
 
    <Style TargetType="{x:Type local:Magnifier}">
-      <Setter Property="IsHitTestVisible" Value="False"/>
+      <Setter Property="IsHitTestVisible" Value="False" />
       <Style.Triggers>
          <Trigger Property="FrameType" Value="Circle">
-            <Setter Property="Template" Value="{StaticResource CircleTemplate}"/>
+            <Setter Property="Template" Value="{StaticResource CircleTemplate}" />
          </Trigger>
          <Trigger Property="FrameType" Value="Rectangle">
-            <Setter Property="Template" Value="{StaticResource RectangleTemplate}"/>
+            <Setter Property="Template" Value="{StaticResource RectangleTemplate}" />
          </Trigger>
       </Style.Triggers>
    </Style>
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml
index 91375b76..085d39e6 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MessageBox/Themes/Generic.xaml
@@ -1,299 +1,329 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls">
 
-    <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="0.479" Color="#FFf4f5f6"/>
-                <GradientStop Offset="1" Color="#FFd0d6db"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFb5bdc8"/>
-                <GradientStop Offset="0.370" Color="#FF8399a9"/>
-                <GradientStop Offset="0.370" Color="#FF718597"/>
-                <GradientStop Offset="0.906" Color="#FFb9c1ca"/>
-                <GradientStop Offset="1" Color="#FFb9c1ca"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFb5bdc8" />
+            <GradientStop Offset="0.370" Color="#FF8399a9" />
+            <GradientStop Offset="0.370" Color="#FF718597" />
+            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
+            <GradientStop Offset="1" Color="#FFb9c1ca" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FF6b7c8d"/>
-                <GradientStop Offset="0.370" Color="#FF4d606f"/>
-                <GradientStop Offset="0.370" Color="#FF465460"/>
-                <GradientStop Offset="0.906" Color="#FF262d33"/>
-                <GradientStop Offset="1" Color="#FF262d33"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FF6b7c8d" />
+            <GradientStop Offset="0.370" Color="#FF4d606f" />
+            <GradientStop Offset="0.370" Color="#FF465460" />
+            <GradientStop Offset="0.906" Color="#FF262d33" />
+            <GradientStop Offset="1" Color="#FF262d33" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="#FF000000"/>
-        <Setter Property="Padding" Value="3"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}"></DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}"></DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
-                            <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0"/>
-                        </Border>
-                        <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                        <Path x:Name="path"
+   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
+      <Setter Property="Foreground" Value="#FF000000" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Button">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
+                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                  <Path x:Name="path"
 								Height="6"
 								Width="7"
 								Stretch="Fill"
 								Opacity="1"
 								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
-								Fill="White" Margin="0,0,0,1" Visibility="Collapsed" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+								Fill="White"
+                        Margin="0,0,0,1"
+                        Visibility="Collapsed" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
-    <!-- =============================================================================== -->
-    <!-- MessageBox                                                                      -->
-    <!-- =============================================================================== -->
+   <!-- =============================================================================== -->
+   <!-- MessageBox                                                                      -->
+   <!-- =============================================================================== -->
 
-    <ControlTemplate x:Key="MessageBoxDragWidgetTemplate" TargetType="{x:Type Thumb}">
-        <Border Background="Transparent">
-        </Border>
-    </ControlTemplate>
+   <ControlTemplate x:Key="MessageBoxDragWidgetTemplate" TargetType="{x:Type Thumb}">
+      <Border Background="Transparent" />
+   </ControlTemplate>
 
-    <Style TargetType="{x:Type local:MessageBox}">
-        <Setter Property="Background" Value="#FFFFFFFF"/>
-        <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="CaptionForeground" Value="#FF000000" />
-        <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="HorizontalAlignment" Value="Left" />
-        <Setter Property="HorizontalContentAlignment" Value="Left" />
-        <Setter Property="IsEnabled" Value="true" />
-        <Setter Property="MinWidth" Value="350" />
-        <Setter Property="MinHeight" Value="50" />
-        <Setter Property="MaxHeight" Value="250" />
-        <Setter Property="VerticalAlignment" Value="Top" />
-        <Setter Property="VerticalContentAlignment" Value="Top" />
-        <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
-        <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
-        <Setter Property="WindowOpacity" Value="1.0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:MessageBox}">
-                    <Grid x:Name="Root">
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="group1">
-                                <VisualState x:Name="OK">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="OKCancel">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="YesNo">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
+   <Style TargetType="{x:Type local:MessageBox}">
+      <Setter Property="Background" Value="#FFFFFFFF" />
+      <Setter Property="BorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="CaptionForeground" Value="#FF000000" />
+      <Setter Property="CloseButtonStyle" Value="{StaticResource WindowCloseButtonStyle}" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="HorizontalAlignment" Value="Left" />
+      <Setter Property="HorizontalContentAlignment" Value="Left" />
+      <Setter Property="IsEnabled" Value="true" />
+      <Setter Property="MinWidth" Value="350" />
+      <Setter Property="MinHeight" Value="50" />
+      <Setter Property="MaxHeight" Value="250" />
+      <Setter Property="VerticalAlignment" Value="Top" />
+      <Setter Property="VerticalContentAlignment" Value="Top" />
+      <Setter Property="WindowBorderBrush" Value="{StaticResource WindowDarkBrush}" />
+      <Setter Property="WindowBackground" Value="{StaticResource WindowBackgroundBrush}" />
+      <Setter Property="WindowOpacity" Value="1.0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:MessageBox}">
+               <Grid x:Name="Root">
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="group1">
+                        <VisualState x:Name="OK">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="OKCancel">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_OkButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="YesNo">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
 
-                                <VisualState x:Name="YesNoCancel">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
-                                            <DiscreteObjectKeyFrame KeyTime="0">
-                                                <DiscreteObjectKeyFrame.Value>
-                                                    <Visibility>Visible</Visibility>
-                                                </DiscreteObjectKeyFrame.Value>
-                                            </DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
+                        <VisualState x:Name="YesNoCancel">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_YesButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_NoButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                              <ObjectAnimationUsingKeyFrames Storyboard.TargetName="PART_CancelButton" Storyboard.TargetProperty="Visibility">
+                                 <DiscreteObjectKeyFrame KeyTime="0">
+                                    <DiscreteObjectKeyFrame.Value>
+                                       <Visibility>Visible</Visibility>
+                                    </DiscreteObjectKeyFrame.Value>
+                                 </DiscreteObjectKeyFrame>
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
 
-                        <!-- Borders -->
-                        <Grid  x:Name="MessageBoxWindowGrid">
-                            <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}"/>
-                            <Grid Margin="0" Background="{x:Null}">
-                                <Border x:Name="MessageBoxWindow" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}"/>
-                                <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7"/>
-                            </Grid>
-                        </Grid>
+                  <!-- Borders -->
+                  <Grid  x:Name="MessageBoxWindowGrid">
+                     <Border BorderBrush="{TemplateBinding WindowBorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="5,5,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                     <Grid Margin="0" Background="{x:Null}">
+                        <Border x:Name="MessageBoxWindow" Margin="1,1,1,1" Background="{TemplateBinding WindowBackground}" CornerRadius="4,4,0,0" Opacity="{TemplateBinding WindowOpacity}" />
+                        <Border BorderBrush="White" BorderThickness="1" CornerRadius="4,4,0,0" Margin="1" Opacity="0.7" />
+                     </Grid>
+                  </Grid>
 
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto" MinHeight="26"/>
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-
-                            <!-- Content Border -->
-                            <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition Height="Auto" />
-                                </Grid.RowDefinitions>
-                                <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1"/>
-                                <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto" MinHeight="26" />
+                        <RowDefinition />
+                     </Grid.RowDefinitions>
 
-                                    <Grid MinWidth="350">
-                                        <Grid.RowDefinitions>
-                                            <RowDefinition />
-                                            <RowDefinition Height="Auto" />
-                                        </Grid.RowDefinitions>
+                     <!-- Content Border -->
+                     <Grid Margin="6,0,6,6" x:Name="ContentGrid" Grid.Row="1">
+                        <Grid.RowDefinitions>
+                           <RowDefinition />
+                           <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+                        <Border BorderBrush="#FFFFFFFF" BorderThickness="1" CornerRadius="1" />
+                        <Border Margin="1"  BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="0.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}">
 
-                                        <Grid Margin="24,16,24,22">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="*"/>
-                                            </Grid.ColumnDefinitions>
+                           <Grid MinWidth="350">
+                              <Grid.RowDefinitions>
+                                 <RowDefinition />
+                                 <RowDefinition Height="Auto" />
+                              </Grid.RowDefinitions>
 
-                                            <!-- Message Image -->
-                                            <Image x:Name="MessageBoxImage" VerticalAlignment="Top" SnapsToDevicePixels="True" Stretch="None"  Margin="-6,-1,10,-4" Source="{TemplateBinding ImageSource}"></Image>
+                              <Grid Margin="24,16,24,22">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="*" />
+                                 </Grid.ColumnDefinitions>
 
-                                            <!-- Message Text -->
-                                            <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
-                                                <TextBlock x:Name="MessageText" TextWrapping="Wrap" VerticalAlignment="Center" MaxWidth="450"
-                                                           Text="{TemplateBinding Text}" 
-                                                           FontFamily="{TemplateBinding FontFamily}"
-                                                           FontSize="{TemplateBinding FontSize}"
-                                                           FontStyle="{TemplateBinding FontStyle}"
-                                                           FontWeight="{TemplateBinding FontWeight}"
-                                                           Foreground="{TemplateBinding Foreground}"/>
-                                            </ScrollViewer>
+                                 <!-- Message Image -->
+                                 <Image x:Name="MessageBoxImage" VerticalAlignment="Top" SnapsToDevicePixels="True" Stretch="None"  Margin="-6,-1,10,-4" Source="{TemplateBinding ImageSource}" />
 
-                                        </Grid>
+                                 <!-- Message Text -->
+                                 <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
+                                    <TextBlock x:Name="MessageText"
+                                               TextWrapping="Wrap"
+                                               VerticalAlignment="Center"
+                                               MaxWidth="450"
+                                               Text="{TemplateBinding Text}" 
+                                               FontFamily="{TemplateBinding FontFamily}"
+                                               FontSize="{TemplateBinding FontSize}"
+                                               FontStyle="{TemplateBinding FontStyle}"
+                                               FontWeight="{TemplateBinding FontWeight}"
+                                               Foreground="{TemplateBinding Foreground}" />
+                                 </ScrollViewer>
 
-                                        <!-- Buttons -->
-                                        <Grid Grid.Row="1" HorizontalAlignment="Right" Margin="12,0,12,12">
-                                            <Grid.ColumnDefinitions>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="Auto"/>
-                                                <ColumnDefinition Width="Auto"/>
-                                            </Grid.ColumnDefinitions>
-                                            <Button Grid.Column="0" x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding YesButtonContent}" />
-                                            <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding NoButtonContent}" />
-                                            <Button Grid.Column="2" x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding OkButtonContent}" />
-                                            <Button Grid.Column="3" x:Name="PART_CancelButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding CancelButtonContent}" IsCancel="True" />
-                                        </Grid>
-                                    </Grid>
-                                </Border>
-                            </Grid>
+                              </Grid>
 
-                            <!-- Header -->
-                            <Border x:Name="HeaderArea" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
-                                <Grid>
-                                    <Grid x:Name="CaptionHeader"  Margin="1,1,105,0" VerticalAlignment="Center">
-                                        <!-- Caption -->
-                                        <ContentControl x:Name="Caption" Margin="5,0,0,0" IsTabStop="False" HorizontalAlignment="Stretch"
-                                                        Content="{TemplateBinding Caption}"
-                                                        Foreground="{TemplateBinding CaptionForeground}"/>
-
-                                    </Grid>
-                                    <Thumb x:Name="PART_DragWidget" Template="{StaticResource MessageBoxDragWidgetTemplate}" IsTabStop="False" />
-                                </Grid>
-                            </Border>
+                              <!-- Buttons -->
+                              <Grid Grid.Row="1" HorizontalAlignment="Right" Margin="12,0,12,12">
+                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                    <ColumnDefinition Width="Auto" />
+                                 </Grid.ColumnDefinitions>
+                                 <Button Grid.Column="0" x:Name="PART_YesButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding YesButtonContent}" />
+                                 <Button Grid.Column="1" x:Name="PART_NoButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding NoButtonContent}" />
+                                 <Button Grid.Column="2" x:Name="PART_OkButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding OkButtonContent}" />
+                                 <Button Grid.Column="3" x:Name="PART_CancelButton" MinWidth="65" Margin="6,0,0,0" Visibility="Collapsed" Content="{TemplateBinding CancelButtonContent}" IsCancel="True" />
+                              </Grid>
+                           </Grid>
+                        </Border>
+                     </Grid>
 
+                     <!-- Header -->
+                     <Border x:Name="HeaderArea" Background="Transparent" Grid.Column="1" CornerRadius="5,5,0,0" Margin="1,1,1,0">
+                        <Grid>
+                           <Grid x:Name="CaptionHeader"  Margin="1,1,105,0" VerticalAlignment="Center">
+                              <!-- Caption -->
+                              <ContentControl x:Name="Caption"
+                                              Margin="5,0,0,0"
+                                              IsTabStop="False"
+                                              HorizontalAlignment="Stretch"
+                                              Content="{TemplateBinding Caption}"
+                                              Foreground="{TemplateBinding CaptionForeground}" />
+                           </Grid>
+                           <Thumb x:Name="PART_DragWidget" Template="{StaticResource MessageBoxDragWidgetTemplate}" IsTabStop="False" />
                         </Grid>
+                     </Border>
 
-                        <Border x:Name="Resize" BorderThickness="7" BorderBrush="Transparent" />
+                  </Grid>
 
-                        <!-- Close Button -->
-                        <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
-                            <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Height="17" Width="43" IsTabStop="False">
-                                <Path Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Width="12" Fill="#E4FFFFFF" Stretch="Fill" Stroke="#FF535666" 
-                                      Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z"/>
-                            </Button>
-                        </Border>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                  <Border x:Name="Resize" BorderThickness="7" BorderBrush="Transparent" />
+
+                  <!-- Close Button -->
+                  <Border BorderBrush="#A5FFFFFF" BorderThickness="1,0,1,1" CornerRadius="0,0,3,3" VerticalAlignment="Top" Margin="0,1,7,0" HorizontalAlignment="Right">
+                     <Button x:Name="PART_CloseButton" Style="{TemplateBinding CloseButtonStyle}" Height="17" Width="43" IsTabStop="False">
+                        <Path Height="10"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center"
+                              Width="12"
+                              Fill="#E4FFFFFF"
+                              Stretch="Fill"
+                              Stroke="#FF535666" 
+                              Data="M0.5,0.5 L4.5178828,0.5 L6.0620003,3.125 L7.4936447,0.5 L11.5,0.5 L11.5,1.5476431 L8.7425003,6.1201854 L11.5,10.359666 L11.5,11.5 L7.4941902,11.5 L6.0620003,8.8740005 L4.5172949,11.5 L0.5,11.5 L0.5,10.43379 L3.3059995,6.1201582 L0.5,1.4676378 L0.5,0.5 z" />
+                     </Button>
+                  </Border>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml
index 51dda2be..d9000fc1 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/MultiLineTextEditor/Themes/Generic.xaml
@@ -1,124 +1,162 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-    <Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Images/Notes16.png" />
+   <Image x:Key="DefaultContent" x:Shared="False" Height="16" Width="18" Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Images/Notes16.png" />
 
-    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <Style x:Key="ToggleButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Grid SnapsToDevicePixels="True">
+   <Style x:Key="ToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
 
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="*"/>
-                                <ColumnDefinition Width="Auto"/>
-                            </Grid.ColumnDefinitions>
-
-                            <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
-                                <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                                  VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-                            </Border>
-
-                            <chrome:ButtonChrome x:Name="ToggleButtonChrome" Grid.Column="1"
-                                             CornerRadius="0,2.75,2.75,0"
-                                            RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
-                                            RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
-											RenderMouseOver="{TemplateBinding IsMouseOver}"
-											RenderPressed="{TemplateBinding IsPressed}" >
-
-                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
-                                    <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                </Grid>
-                            </chrome:ButtonChrome>
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="Auto" />
+                     </Grid.ColumnDefinitions>
+
+                     <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="True">
+                        <ContentPresenter Content="{TemplateBinding Content}"
+                                          ContentTemplate="{TemplateBinding ContentTemplate}"
+                                          ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                     </Border>
+
+                     <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                          Grid.Column="1"
+                                          CornerRadius="0,2.75,2.75,0"
+                                          RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
+                                          RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:MultiLineTextEditor}}"
+											         RenderMouseOver="{TemplateBinding IsMouseOver}"
+											         RenderPressed="{TemplateBinding IsPressed}">
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
                         </Grid>
+                     </chrome:ButtonChrome>
+                  </Grid>
 
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type local:MultiLineTextEditor}">
-        <Setter Property="Background" Value="White"/>
-        <Setter Property="BorderBrush">
-            <Setter.Value>
-                <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
-                    <GradientStop Color="#FFA3AEB9" Offset="0" />
-                    <GradientStop Color="#FF8399A9" Offset="0.375" />
-                    <GradientStop Color="#FF718597" Offset="0.375" />
-                    <GradientStop Color="#FF617584" Offset="1" />
-                </LinearGradientBrush>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="BorderThickness" Value="1,1,0,1" />
-        <Setter Property="Content" Value="{StaticResource DefaultContent}" />
-        <Setter Property="Focusable" Value="False" />
-        <Setter Property="Padding" Value="2,0,0,0" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:MultiLineTextEditor}">
-                    <Grid x:Name="Root">
-                        <ToggleButton x:Name="PART_DropDownButton" Grid.Column="1" IsTabStop="True" MinHeight="22" SnapsToDevicePixels="True"
-                                      Background="{TemplateBinding Background}" 
-                                      BorderBrush="{TemplateBinding BorderBrush}" 
-                                      BorderThickness="{TemplateBinding BorderThickness}" 
-                                      Padding="{TemplateBinding Padding}"
-                                      Content="{TemplateBinding Content}"
-                                      ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
-                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                                      Style="{StaticResource ToggleButtonStyle}"
-                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
-                                      VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"/>
-                        <Popup IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}" StaysOpen="False"
-                               Placement="Bottom" SnapsToDevicePixels="True" AllowsTransparency="True" Focusable="False" PopupAnimation="Slide"
-                               Width="{TemplateBinding DropDownWidth}" Height="{TemplateBinding DropDownHeight}">
-                            <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
-                                <Grid>
-                                    <TextBox x:Name="PART_TextBox" AcceptsReturn="true" TextWrapping="{TemplateBinding TextWrapping}" Padding="{TemplateBinding Padding}" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto"
-                                             SpellCheck.IsEnabled="{TemplateBinding IsSpellCheckEnabled}"
-                                             Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                             TextAlignment="{TemplateBinding TextAlignment}"
-                                             Margin="3" />
-                                    <Thumb x:Name="PART_ResizeThumb" HorizontalAlignment="Right" VerticalAlignment="Bottom" Cursor="SizeNWSE">
-                                        <Thumb.Template>
-                                            <ControlTemplate TargetType="{x:Type Thumb}">
-                                                <Grid Background="Transparent">
-                                                    <Path Data="M0.5,6.5 L6.5,0.5 M6.5,3.5 L3.5,6.5" Stroke="Black" StrokeThickness="1" />
-                                                </Grid>
-                                            </ControlTemplate>
-                                        </Thumb.Template>
-                                    </Thumb>
-                                </Grid>
-                            </Border>
-                        </Popup>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:MultiLineTextEditor}">
+      <Setter Property="Background" Value="White"/>
+      <Setter Property="BorderBrush">
+         <Setter.Value>
+            <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
+               <GradientStop Color="#FFA3AEB9" Offset="0" />
+               <GradientStop Color="#FF8399A9" Offset="0.375" />
+               <GradientStop Color="#FF718597" Offset="0.375" />
+               <GradientStop Color="#FF617584" Offset="1" />
+            </LinearGradientBrush>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="BorderThickness" Value="1,1,0,1" />
+      <Setter Property="Content" Value="{StaticResource DefaultContent}" />
+      <Setter Property="Focusable" Value="False" />
+      <Setter Property="Padding" Value="2,0,0,0" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:MultiLineTextEditor}">
+               <Grid x:Name="Root">
+                  <ToggleButton x:Name="PART_DropDownButton"
+                                Grid.Column="1"
+                                IsTabStop="True"
+                                MinHeight="22"
+                                SnapsToDevicePixels="True"
+                                Background="{TemplateBinding Background}" 
+                                BorderBrush="{TemplateBinding BorderBrush}" 
+                                BorderThickness="{TemplateBinding BorderThickness}" 
+                                Padding="{TemplateBinding Padding}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}"
+                                ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}"
+                                IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                Style="{StaticResource ToggleButtonStyle}"
+                                IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"
+                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                  <Popup IsOpen="{Binding IsChecked, ElementName=PART_DropDownButton}"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         SnapsToDevicePixels="True"
+                         AllowsTransparency="True"
+                         Focusable="False"
+                         PopupAnimation="Slide"
+                         Width="{TemplateBinding DropDownWidth}"
+                         Height="{TemplateBinding DropDownHeight}">
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                        <Grid>
+                           <TextBox x:Name="PART_TextBox"
+                                    AcceptsReturn="true"
+                                    TextWrapping="{TemplateBinding TextWrapping}"
+                                    Padding="{TemplateBinding Padding}"
+                                    VerticalScrollBarVisibility="Auto"
+                                    HorizontalScrollBarVisibility="Auto"
+                                    SpellCheck.IsEnabled="{TemplateBinding IsSpellCheckEnabled}"
+                                    Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                    TextAlignment="{TemplateBinding TextAlignment}"
+                                    Margin="3" />
+                           <Thumb x:Name="PART_ResizeThumb" HorizontalAlignment="Right" VerticalAlignment="Bottom" Cursor="SizeNWSE">
+                              <Thumb.Template>
+                                 <ControlTemplate TargetType="{x:Type Thumb}">
+                                    <Grid Background="Transparent">
+                                       <Path Data="M0.5,6.5 L6.5,0.5 M6.5,3.5 L3.5,6.5" Stroke="Black" StrokeThickness="1" />
+                                    </Grid>
+                                 </ControlTemplate>
+                              </Thumb.Template>
+                           </Thumb>
+                        </Grid>
+                     </Border>
+                  </Popup>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
index 45b40fc1..69a74190 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/NumericUpDown/Themes/Generic.xaml
@@ -1,84 +1,108 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters"
                     xmlns:prims="clr-namespace:Microsoft.Windows.Controls.Primitives">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
-    </DataTemplate>
-
-    <Style x:Key="NumericUpDown" TargetType="Control">
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}"/>
-        <Setter Property="HorizontalContentAlignment" Value="Right" />
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Control">
-                    <local:ButtonSpinner x:Name="Spinner" IsTabStop="False" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}"
-                                         AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}" ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}">
-                        <local:WatermarkTextBox x:Name="TextBox" BorderThickness="0"
-                                                Background="Transparent"
-                                                ContextMenu="{TemplateBinding ContextMenu}"
-                                                FontFamily="{TemplateBinding FontFamily}" 
-                                                FontSize="{TemplateBinding FontSize}" 
-                                                FontStretch="{TemplateBinding FontStretch}"
-                                                FontStyle="{TemplateBinding FontStyle}" 
-                                                FontWeight="{TemplateBinding FontWeight}" 
-                                                Foreground="{TemplateBinding Foreground}" 
-                                                HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
-                                                MinWidth="20" AcceptsReturn="False"
-                                                Padding="0"
-                                                SelectAllOnGotFocus="{Binding SelectAllOnGotFocus, RelativeSource={RelativeSource TemplatedParent}}"
-                                                TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
-                                                TextWrapping="NoWrap" 
-                                                TabIndex="{TemplateBinding TabIndex}"
-                                                Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
-                                                VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                Watermark="{Binding Watermark, RelativeSource={RelativeSource TemplatedParent}}"
-                                                WatermarkTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}}"/>
-                    </local:ButtonSpinner>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- =============================================================================== -->
-    <!-- DecimalUpDown                                                                   -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:DecimalUpDown}" BasedOn="{StaticResource NumericUpDown}">
-        <Setter Property="TextAlignment" Value="Right" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-    </Style>
-
-    <!-- =============================================================================== -->
-    <!-- DoubleUpDown                                                                    -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:DoubleUpDown}" BasedOn="{StaticResource NumericUpDown}">
-        <Setter Property="TextAlignment" Value="Right" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-    </Style>
-
-    <!-- =============================================================================== -->
-    <!-- IntegerUpDown                                                                   -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:IntegerUpDown}" BasedOn="{StaticResource NumericUpDown}">
-        <Setter Property="TextAlignment" Value="Right" />
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-    </Style>
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <Style x:Key="NumericUpDown" TargetType="Control">
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.WindowTextBrushKey}}" />
+      <Setter Property="HorizontalContentAlignment" Value="Right" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Control">
+               <local:ButtonSpinner x:Name="Spinner"
+                                    IsTabStop="False"
+                                    Background="{TemplateBinding Background}"
+                                    BorderThickness="{TemplateBinding BorderThickness}"
+                                    AllowSpin="{Binding AllowSpin, RelativeSource={RelativeSource TemplatedParent}}"
+                                    ShowButtonSpinner="{Binding ShowButtonSpinner, RelativeSource={RelativeSource TemplatedParent}}">
+                  <local:WatermarkTextBox x:Name="TextBox"
+                                          BorderThickness="0"
+                                          Background="Transparent"
+                                          ContextMenu="{TemplateBinding ContextMenu}"
+                                          FontFamily="{TemplateBinding FontFamily}" 
+                                          FontSize="{TemplateBinding FontSize}" 
+                                          FontStretch="{TemplateBinding FontStretch}"
+                                          FontStyle="{TemplateBinding FontStyle}" 
+                                          FontWeight="{TemplateBinding FontWeight}" 
+                                          Foreground="{TemplateBinding Foreground}" 
+                                          HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                          IsReadOnly="{Binding IsReadOnly, RelativeSource={RelativeSource TemplatedParent}}"
+                                          MinWidth="20"
+                                          AcceptsReturn="False"
+                                          Padding="0"
+                                          SelectAllOnGotFocus="{Binding SelectAllOnGotFocus, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TextAlignment="{Binding TextAlignment, RelativeSource={RelativeSource TemplatedParent}}"
+                                          TextWrapping="NoWrap" 
+                                          TabIndex="{TemplateBinding TabIndex}"
+                                          Text="{Binding Text, RelativeSource={RelativeSource TemplatedParent}}"
+                                          VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                                          Watermark="{Binding Watermark, RelativeSource={RelativeSource TemplatedParent}}"
+                                          WatermarkTemplate="{Binding WatermarkTemplate, RelativeSource={RelativeSource TemplatedParent}}" />
+               </local:ButtonSpinner>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- DecimalUpDown                                                                   -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DecimalUpDown}" BasedOn="{StaticResource NumericUpDown}">
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- DoubleUpDown                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:DoubleUpDown}" BasedOn="{StaticResource NumericUpDown}">
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- IntegerUpDown                                                                   -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:IntegerUpDown}" BasedOn="{StaticResource NumericUpDown}">
+      <Setter Property="TextAlignment" Value="Right" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs
index e1c62c0c..cb453274 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Properties/AssemblyInfo.cs
@@ -1,23 +1,39 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
+/************************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  **********************************************************************/
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
+using System.Security;
 using System.Windows;
 using System.Windows.Markup;
-using System;
-using System.Security;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
-[assembly: AssemblyTitle("Extended WPF Toolkit")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Extended WPF Toolkit")]
-[assembly: AssemblyCopyright("Copyright ©  2010")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+[assembly: AssemblyTitle( "Extended WPF Toolkit" )]
+[assembly: AssemblyDescription( "" )]
+[assembly: AssemblyConfiguration( "" )]
+[assembly: AssemblyCompany( "" )]
+[assembly: AssemblyProduct( "Extended WPF Toolkit" )]
+[assembly: AssemblyCopyright( "Copyright ©  2010" )]
+[assembly: AssemblyTrademark( "" )]
+[assembly: AssemblyCulture( "" )]
 
 // Needed to enable xbap scenarios
 [assembly: AllowPartiallyTrustedCallers]
@@ -25,8 +41,8 @@ using System.Security;
 // Setting ComVisible to false makes the types in this assembly not visible 
 // to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-[assembly: CLSCompliant(true)]
+[assembly: ComVisible( false )]
+[assembly: CLSCompliant( true )]
 
 //In order to begin building localizable applications, set 
 //<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
@@ -40,11 +56,11 @@ using System.Security;
 
 [assembly: ThemeInfo(
     ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-    //(used if a resource is not found in the page, 
-    // or application resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // or application resource dictionaries)
     ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-    //(used if a resource is not found in the page, 
-    // app, or any theme specific resource dictionaries)
+  //(used if a resource is not found in the page, 
+  // app, or any theme specific resource dictionaries)
 )]
 
 
@@ -58,9 +74,9 @@ using System.Security;
 // 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("1.6.0.0")]
-[assembly: AssemblyFileVersion("1.6.0.0")]
+[assembly: AssemblyVersion( "1.6.0.0" )]
+[assembly: AssemblyFileVersion( "1.6.0.0" )]
 
-[assembly: XmlnsPrefix("http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "extToolkit")]
-[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "Microsoft.Windows.Controls")]
-[assembly: XmlnsDefinition("http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "Microsoft.Windows.Controls.PropertyGrid")]
+[assembly: XmlnsPrefix( "http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "extToolkit" )]
+[assembly: XmlnsDefinition( "http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "Microsoft.Windows.Controls" )]
+[assembly: XmlnsDefinition( "http://schemas.microsoft.com/winfx/2006/xaml/presentation/toolkit/extended", "Microsoft.Windows.Controls.PropertyGrid" )]
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml
index 39ef11f6..57f43170 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/PropertyGrid/Themes/Generic.xaml
@@ -1,4 +1,22 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:extToolkit="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls.PropertyGrid"
@@ -7,498 +25,513 @@
                     xmlns:utilities="clr-namespace:Microsoft.Windows.Controls.Core.Utilities"
                     xmlns:commands="clr-namespace:Microsoft.Windows.Controls.PropertyGrid.Commands">
 
-    <!-- =============================================================================== -->
-    <!-- PropertyGrid                                                                    -->
-    <!-- =============================================================================== -->
-
-    <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-    <converters:InverseBoolConverter x:Key="InverseBoolConverter" />
-    <pgConverters:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
-    <pgConverters:ValueSourceToImagePathConverter x:Key="ValueSourceToImagePathConverter" />
-    <pgConverters:ValueSourceToToolTipConverter x:Key="ValueSourceToToolTipConverter" />
-
-    <SolidColorBrush x:Key="MouseOverBorderBrush" Color="#FFFFB700" />
-    <LinearGradientBrush x:Key="MouseOverBackgroundBrush" StartPoint="0,0" EndPoint="0,1" >
-        <GradientStop Offset="0" Color="#FFFEFBF4" />
-        <GradientStop Offset="0.19" Color="#FFFDE7CE" />
-        <GradientStop Offset="0.39" Color="#FFFDDEB8" />
-        <GradientStop Offset="0.39" Color="#FFFFCE6B" />
-        <GradientStop Offset="0.79" Color="#FFFFDE9A" />
-        <GradientStop Offset="1" Color="#FFFFEBAA" />
-    </LinearGradientBrush>
-
-    <SolidColorBrush x:Key="CheckedBorderBrush" Color="#FFC29B29" />
-    <LinearGradientBrush x:Key="CheckedBackgroundBrush" StartPoint="0,0" EndPoint="0,1" >
-        <GradientStop Offset="0" Color="#FFFFDCA0" />
-        <GradientStop Offset="0.18" Color="#FFFFD692" />
-        <GradientStop Offset="0.39" Color="#FFFFC45D" />
-        <GradientStop Offset="1" Color="#FFFFD178" />
-    </LinearGradientBrush>
-
-    <SolidColorBrush x:Key="PressedBorderBrush" Color="#FFC29B29" />
-    <LinearGradientBrush x:Key="PressedBackgroundBrush" StartPoint="0,0" EndPoint="0,1" >
-        <GradientStop Offset="0" Color="#FFE3C085" />
-        <GradientStop Offset="0.19" Color="#FFF4CC89" />
-        <GradientStop Offset="0.36" Color="#FFF5C777" />
-        <GradientStop Offset="0.36" Color="#FFF5BB56" />
-        <GradientStop Offset="0.79" Color="#FFF4CE9A" />
-        <GradientStop Offset="1" Color="#FFF3E28D" />
-    </LinearGradientBrush>
-
-    <Style x:Key="OptionsToggleButtonStyle" TargetType="{x:Type RadioButton}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Height" Value="22" />
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="ToolTipService.InitialShowDelay" Value="900"/>
-        <Setter Property="ToolTipService.ShowDuration" Value="20000"/>
-        <Setter Property="ToolTipService.BetweenShowDelay" Value="0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type RadioButton}">
-                    <Grid SnapsToDevicePixels="True">
-                        <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2"/>
-                        <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
-                            <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
-                                <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-                                    <ContentPresenter x:Name="Content" Content="{TemplateBinding Content}" Margin="1"
-                                           RenderOptions.BitmapScalingMode="NearestNeighbor"
+   <!-- =============================================================================== -->
+   <!-- PropertyGrid                                                                    -->
+   <!-- =============================================================================== -->
+
+   <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
+   <converters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <pgConverters:ExpandableObjectMarginConverter x:Key="ExpandableObjectMarginConverter" />
+   <pgConverters:ValueSourceToImagePathConverter x:Key="ValueSourceToImagePathConverter" />
+   <pgConverters:ValueSourceToToolTipConverter x:Key="ValueSourceToToolTipConverter" />
+
+   <SolidColorBrush x:Key="MouseOverBorderBrush" Color="#FFFFB700" />
+   <LinearGradientBrush x:Key="MouseOverBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Offset="0" Color="#FFFEFBF4" />
+      <GradientStop Offset="0.19" Color="#FFFDE7CE" />
+      <GradientStop Offset="0.39" Color="#FFFDDEB8" />
+      <GradientStop Offset="0.39" Color="#FFFFCE6B" />
+      <GradientStop Offset="0.79" Color="#FFFFDE9A" />
+      <GradientStop Offset="1" Color="#FFFFEBAA" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="CheckedBorderBrush" Color="#FFC29B29" />
+   <LinearGradientBrush x:Key="CheckedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Offset="0" Color="#FFFFDCA0" />
+      <GradientStop Offset="0.18" Color="#FFFFD692" />
+      <GradientStop Offset="0.39" Color="#FFFFC45D" />
+      <GradientStop Offset="1" Color="#FFFFD178" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="PressedBorderBrush" Color="#FFC29B29" />
+   <LinearGradientBrush x:Key="PressedBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <GradientStop Offset="0" Color="#FFE3C085" />
+      <GradientStop Offset="0.19" Color="#FFF4CC89" />
+      <GradientStop Offset="0.36" Color="#FFF5C777" />
+      <GradientStop Offset="0.36" Color="#FFF5BB56" />
+      <GradientStop Offset="0.79" Color="#FFF4CE9A" />
+      <GradientStop Offset="1" Color="#FFF3E28D" />
+   </LinearGradientBrush>
+
+   <Style x:Key="OptionsToggleButtonStyle" TargetType="{x:Type RadioButton}">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Height" Value="22" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+      <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+      <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type RadioButton}">
+               <Grid SnapsToDevicePixels="True">
+                  <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2" />
+                  <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                     <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                        <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                           <ContentPresenter x:Name="Content"
+                                             Content="{TemplateBinding Content}"
+                                             Margin="1"
+                                             RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                             VerticalAlignment="Center"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        </StackPanel>
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                  </Trigger>
+
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                     <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                  </Trigger>
+
+                  <Trigger Property="IsChecked" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder">
+                        <Setter.Value>
+                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                              <GradientStop Color="#FFE7CBAD" Offset="0" />
+                              <GradientStop Color="#FFF7D7B5" Offset="0.1" />
+                              <GradientStop Color="#FFFFD38C" Offset="0.36" />
+                              <GradientStop Color="#FFFFC75A" Offset="0.36" />
+                              <GradientStop Color="#FFFFEFA5" Offset="1" />
+                           </LinearGradientBrush>
+                        </Setter.Value>
+                     </Setter>
+                  </Trigger>
+
+                  <Trigger Property="IsPressed" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                  </Trigger>
+
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsChecked" Value="True" />
+                        <Condition Property="IsMouseOver" Value="True" />
+                     </MultiTrigger.Conditions>
+                     <Setter Property="Background" TargetName="MiddleBorder">
+                        <Setter.Value>
+                           <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
+                              <GradientStop Color="#40FFFEFE" Offset="0" />
+                              <GradientStop Color="#40FFFEFE" Offset="0.39" />
+                              <GradientStop Color="#20FFCE68" Offset="0.39" />
+                              <GradientStop Color="#20FFCE68" Offset="0.69" />
+                              <GradientStop Color="#10FFFFFF" Offset="1" />
+                           </LinearGradientBrush>
+                        </Setter.Value>
+                     </Setter>
+                  </MultiTrigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="ClearFilterButtonStyle" TargetType="{x:Type Button}">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Height" Value="22" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="ToolTipService.InitialShowDelay" Value="900" />
+      <Setter Property="ToolTipService.ShowDuration" Value="20000" />
+      <Setter Property="ToolTipService.BetweenShowDelay" Value="0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Button}">
+               <Grid SnapsToDevicePixels="True">
+                  <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2" />
+                  <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
+                     <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
+                        <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
+                           <ContentPresenter x:Name="Content"
+                                             Content="{TemplateBinding Content}"
+                                             Margin="1"
+                                             RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                             VerticalAlignment="Center"
+                                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
+                        </StackPanel>
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF" />
+                  </Trigger>
+
+                  <Trigger Property="IsEnabled" Value="False">
+                     <Setter Property="Opacity" TargetName="Content" Value="0.5" />
+                     <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E" />
+                  </Trigger>
+
+                  <Trigger Property="IsPressed" Value="True">
+                     <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}" />
+                     <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}" />
+                     <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <SolidColorBrush x:Key="GlyphBrush" Color="#FF31347C" />
+
+   <ControlTemplate x:Key="ExpanderToggleButton" TargetType="{x:Type ToggleButton}">
+      <Grid>
+         <Rectangle Margin="0,0,0,0" x:Name="Rectangle" Fill="Transparent" />
+         <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" RenderTransformOrigin="0.5,0.5">
+            <Path.RenderTransform>
+               <TransformGroup>
+                  <ScaleTransform ScaleX="1" ScaleY="1" />
+                  <SkewTransform AngleX="0" AngleY="0" />
+                  <RotateTransform Angle="-90" />
+                  <TranslateTransform X="0" Y="0" />
+               </TransformGroup>
+            </Path.RenderTransform>
+         </Path>
+         <Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" RenderTransformOrigin="0.5,0.5">
+            <Path.RenderTransform>
+               <TransformGroup>
+                  <ScaleTransform ScaleX="1" ScaleY="1" />
+                  <SkewTransform AngleX="0" AngleY="0" />
+                  <RotateTransform Angle="135" />
+                  <TranslateTransform X="0" Y="0" />
+               </TransformGroup>
+            </Path.RenderTransform>
+         </Path>
+      </Grid>
+      <ControlTemplate.Triggers>
+         <Trigger Property="IsChecked" Value="true">
+            <Setter Property="Visibility" Value="Visible" TargetName="Down_Arrow" />
+            <Setter Property="Visibility" Value="Collapsed" TargetName="Up_Arrow" />
+            <Setter Property="OpacityMask" TargetName="Down_Arrow" Value="#FF000000" />
+         </Trigger>
+      </ControlTemplate.Triggers>
+   </ControlTemplate>
+
+   <Style x:Key="ExpanderStyle" TargetType="{x:Type Expander}">
+      <Setter Property="Padding" Value="0" />
+      <Setter Property="Background" Value="#FFF0F0F0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Expander}">
+               <Grid>
+                  <Grid.RowDefinitions>
+                     <RowDefinition Height="Auto" />
+                     <RowDefinition Height="*" x:Name="ContentRow" />
+                  </Grid.RowDefinitions>
+                  <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="#FFF0F0F0">
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="20" />
+                           <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <ToggleButton Template="{StaticResource ExpanderToggleButton}" IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True" />
+                        <ContentPresenter Grid.Column="1" Margin="1" RecognizesAccessKey="True" ContentSource="Header" TextElement.FontWeight="Bold" />
+                     </Grid>
+                  </Border>
+                  <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Background="#FFF0F0F0" Padding="10 0 0 0">
+                     <Border Background="#FFFFFF" BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="false" />
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="True">
+                     <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style x:Key="PropertyExpanderStyle" TargetType="{x:Type Expander}">
+      <Setter Property="Padding" Value="10 0 0 0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type Expander}">
+               <Grid>
+                  <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Padding="0 0 0 0">
+                     <Border BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
+                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+												      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+												      Focusable="false" />
+                     </Border>
+                  </Border>
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsExpanded" Value="True">
+                     <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <ContextMenu x:Key="DefaultAdvancedOptionsMenu">
+      <MenuItem Header="Reset Value" Command="commands:PropertyItemCommands.ResetValue" />
+   </ContextMenu>
+
+   <Style TargetType="{x:Type local:PropertyItem}">
+      <Setter Property="BorderBrush" Value="#FFF0F0F0" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Focusable" Value="True" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:PropertyItem}">
+               <Border Background="White" ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PropertyGrid}}" ContextMenuService.Placement="Bottom">
+                  <Grid VerticalAlignment="Center" HorizontalAlignment="Stretch">
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PropertyGrid}}}" />
+                        <ColumnDefinition Width="*" />
+                     </Grid.ColumnDefinitions>
+                     <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                     </Grid.RowDefinitions>
+
+                     <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Name">
+                        <Grid Margin="2,2,2,2">
+                           <Grid.ColumnDefinitions>
+                              <ColumnDefinition Width="*" />
+                              <ColumnDefinition Width="Auto" />
+                           </Grid.ColumnDefinitions>
+
+                           <Grid Margin="{Binding Level, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ExpandableObjectMarginConverter}}">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="15" />
+                                 <ColumnDefinition Width="*" />
+                              </Grid.ColumnDefinitions>
+
+                              <Border Grid.Column="0">
+                                 <ToggleButton Template="{StaticResource ExpanderToggleButton}"
+                                               OverridesDefaultStyle="True"
+                                               IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
+                                               Visibility="{Binding HasChildProperties, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                              </Border>
+
+                              <TextBlock Grid.Column="1" Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" TextTrimming="CharacterEllipsis" />
+                           </Grid>
+
+                           <Grid Grid.Column="1"
+                                 HorizontalAlignment="Right"
+                                 Margin="5,0,5,0"
+                                 Visibility="{Binding ShowAdvancedOptions, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PropertyGrid}, Converter={StaticResource BooleanToVisibilityConverter}}"
+                                 utilities:ContextMenuUtilities.OpenOnMouseLeftButtonClick="True"
+                                 ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PropertyGrid}}">
+
+                              <Image x:Name="_optionsImage"
+                                     Width="11"
+                                     Height="11"
+                                     Source="{Binding ValueSource, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ValueSourceToImagePathConverter}}"
+                                     ToolTip="{Binding ValueSource, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ValueSourceToToolTipConverter}}" />
+                           </Grid>
+                        </Grid>
+                     </Border>
+
+                     <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Editor" Grid.Column="1" Background="Transparent">
+                        <ContentControl Content="{TemplateBinding Editor}" VerticalAlignment="Center" Focusable="False" IsTabStop="False" />
+                     </Border>
+
+                     <Expander x:Name="_propertyExpander" Grid.ColumnSpan="2" Grid.Row="1" IsExpanded="{TemplateBinding IsExpanded}" Style="{StaticResource PropertyExpanderStyle}" IsEnabled="True">
+                        <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False">
+                           <ItemsControl.ItemsPanel>
+                              <ItemsPanelTemplate>
+                                 <VirtualizingStackPanel />
+                              </ItemsPanelTemplate>
+                           </ItemsControl.ItemsPanel>
+                        </ItemsControl>
+                     </Expander>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <DataTrigger Binding="{Binding IsDataBound, RelativeSource={RelativeSource Self}}" Value="True">
+                     <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Database11.png" />
+                     <Setter TargetName="_optionsImage" Property="ToolTip" Value="Databinding" />
+                  </DataTrigger>
+                  <DataTrigger Binding="{Binding IsDynamicResource, RelativeSource={RelativeSource Self}}" Value="True">
+                     <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Resource11.png" />
+                     <Setter TargetName="_optionsImage" Property="ToolTip" Value="Resource" />
+                  </DataTrigger>
+                  <DataTrigger Binding="{Binding HasResourceApplied, RelativeSource={RelativeSource Self}}" Value="True">
+                     <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Resource11.png" />
+                     <Setter TargetName="_optionsImage" Property="ToolTip" Value="Resource" />
+                  </DataTrigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="PART_Name" Property="Background" Value="#CED4DF" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="PART_Name" Property="Background" Value="#43577B" />
+                     <Setter TargetName="PART_Name" Property="TextElement.Foreground" Value="White" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:PropertyGrid}">
+      <Setter Property="AdvancedOptionsMenu" Value="{StaticResource DefaultAdvancedOptionsMenu}" />
+      <Setter Property="Background" Value="#CED4DF" />
+      <Setter Property="BorderBrush" Value="#43577B" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:PropertyGrid}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="Auto" />
+                        <RowDefinition />
+                        <RowDefinition Height="5" />
+                        <RowDefinition Height="Auto"/>
+                     </Grid.RowDefinitions>
+
+                     <StackPanel Orientation="Horizontal" Margin="6,2,0,4">
+                        <TextBlock Text="{TemplateBinding SelectedObjectTypeName}" FontWeight="Bold" />
+                        <TextBlock Text="{TemplateBinding SelectedObjectName}" Margin="5,0,0,0" />
+                     </StackPanel>
+
+                     <Grid Grid.Row="1" Margin="4,0,4,4">
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="Auto" />
+                           <ColumnDefinition Width="*" />
+                        </Grid.ColumnDefinitions>
+                        <Grid Background="#BCC7D8" Margin="4" Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                           <StackPanel Orientation="Horizontal" Margin="1" >
+                              <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}}"
                                            VerticalAlignment="Center"
-                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                                </StackPanel>
-                            </Border>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
-                        </Trigger>
-
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" TargetName="Content" Value="0.5"/>
-                            <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E"/>
-                        </Trigger>
-
-                        <Trigger Property="IsChecked" Value="True">
-                            <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource CheckedBackgroundBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource CheckedBorderBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder">
-                                <Setter.Value>
-                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                        <GradientStop Color="#FFE7CBAD" Offset="0"/>
-                                        <GradientStop Color="#FFF7D7B5" Offset="0.1"/>
-                                        <GradientStop Color="#FFFFD38C" Offset="0.36"/>
-                                        <GradientStop Color="#FFFFC75A" Offset="0.36"/>
-                                        <GradientStop Color="#FFFFEFA5" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Setter.Value>
-                            </Setter>
-                        </Trigger>
-
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent"/>
-                        </Trigger>
-
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsChecked" Value="True"/>
-                                <Condition Property="IsMouseOver" Value="True"/>
-                            </MultiTrigger.Conditions>
-                            <Setter Property="Background" TargetName="MiddleBorder">
-                                <Setter.Value>
-                                    <LinearGradientBrush EndPoint="0,1" StartPoint="0,0">
-                                        <GradientStop Color="#40FFFEFE" Offset="0"/>
-                                        <GradientStop Color="#40FFFEFE" Offset="0.39"/>
-                                        <GradientStop Color="#20FFCE68" Offset="0.39"/>
-                                        <GradientStop Color="#20FFCE68" Offset="0.69"/>
-                                        <GradientStop Color="#10FFFFFF" Offset="1"/>
-                                    </LinearGradientBrush>
-                                </Setter.Value>
-                            </Setter>
-                        </MultiTrigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="ClearFilterButtonStyle" TargetType="{x:Type Button}">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Height" Value="22" />
-        <Setter Property="HorizontalContentAlignment" Value="Center"/>
-        <Setter Property="ToolTipService.InitialShowDelay" Value="900"/>
-        <Setter Property="ToolTipService.ShowDuration" Value="20000"/>
-        <Setter Property="ToolTipService.BetweenShowDelay" Value="0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Button}">
-                    <Grid SnapsToDevicePixels="True">
-                        <Border x:Name="OuterBorder" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" CornerRadius="2"/>
-                        <Border x:Name="MiddleBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2">
-                            <Border x:Name="InnerBorder" BorderBrush="Transparent" BorderThickness="{TemplateBinding BorderThickness}" Background="Transparent" CornerRadius="2" Padding="{TemplateBinding Padding}">
-                                <StackPanel x:Name="StackPanel" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}">
-                                    <ContentPresenter x:Name="Content" Content="{TemplateBinding Content}" Margin="1"
-                                           RenderOptions.BitmapScalingMode="NearestNeighbor"
+                                           Style="{StaticResource OptionsToggleButtonStyle}"
+                                           ToolTip="Categorized">
+                                 <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/Categorize16.png" Width="16" Height="16" />
+                              </RadioButton>
+                              <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}"
                                            VerticalAlignment="Center"
-                                           HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" />
-                                </StackPanel>
-                            </Border>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource MouseOverBackgroundBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource MouseOverBorderBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="#80FFFFFF"/>
-                        </Trigger>
-
-                        <Trigger Property="IsEnabled" Value="False">
-                            <Setter Property="Opacity" TargetName="Content" Value="0.5"/>
-                            <Setter Property="TextElement.Foreground" TargetName="OuterBorder" Value="#FF9E9E9E"/>
-                        </Trigger>
-
-                        <Trigger Property="IsPressed" Value="True">
-                            <Setter Property="Background" TargetName="OuterBorder" Value="{StaticResource PressedBackgroundBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="OuterBorder" Value="{StaticResource PressedBorderBrush}"/>
-                            <Setter Property="BorderBrush" TargetName="InnerBorder" Value="Transparent"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <SolidColorBrush x:Key="GlyphBrush" Color="#FF31347C"/>
-
-    <ControlTemplate x:Key="ExpanderToggleButton" TargetType="{x:Type ToggleButton}">
-        <Grid>
-            <Rectangle Margin="0,0,0,0" x:Name="Rectangle" Fill="Transparent" />
-            <Path HorizontalAlignment="Center" x:Name="Up_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 0 L 4 4 L 8 0 Z" RenderTransformOrigin="0.5,0.5">
-                <Path.RenderTransform>
-                    <TransformGroup>
-                        <ScaleTransform ScaleX="1" ScaleY="1" />
-                        <SkewTransform AngleX="0" AngleY="0" />
-                        <RotateTransform Angle="-90" />
-                        <TranslateTransform X="0" Y="0" />
-                    </TransformGroup>
-                </Path.RenderTransform>
-            </Path>
-            <Path Visibility="Collapsed" HorizontalAlignment="Center" x:Name="Down_Arrow" VerticalAlignment="Center" Fill="{StaticResource GlyphBrush}" Data="M 0 4 L 4 0 L 8 4 Z" RenderTransformOrigin="0.5,0.5">
-                <Path.RenderTransform>
-                    <TransformGroup>
-                        <ScaleTransform ScaleX="1" ScaleY="1" />
-                        <SkewTransform AngleX="0" AngleY="0" />
-                        <RotateTransform Angle="135" />
-                        <TranslateTransform X="0" Y="0" />
-                    </TransformGroup>
-                </Path.RenderTransform>
-            </Path>
-        </Grid>
-        <ControlTemplate.Triggers>
-            <Trigger Property="IsChecked" Value="true">
-                <Setter Property="Visibility" Value="Visible" TargetName="Down_Arrow" />
-                <Setter Property="Visibility" Value="Collapsed" TargetName="Up_Arrow" />
-                <Setter Property="OpacityMask" TargetName="Down_Arrow" Value="#FF000000" />
-            </Trigger>
-        </ControlTemplate.Triggers>
-    </ControlTemplate>
-
-    <Style x:Key="ExpanderStyle" TargetType="{x:Type Expander}">
-        <Setter Property="Padding" Value="0" />
-        <Setter Property="Background" Value="#FFF0F0F0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Expander}">
-                    <Grid>
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto" />
-                            <RowDefinition Height="*" x:Name="ContentRow" />
-                        </Grid.RowDefinitions>
-                        <Border x:Name="Border" Background="{TemplateBinding Background}" BorderBrush="#FFF0F0F0">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="20" />
-                                    <ColumnDefinition Width="*" />
-                                </Grid.ColumnDefinitions>
-                                <ToggleButton Template="{StaticResource ExpanderToggleButton}" IsChecked="{Binding Path=IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}" OverridesDefaultStyle="True"  />
-                                <ContentPresenter Grid.Column="1" Margin="1" RecognizesAccessKey="True" ContentSource="Header" TextElement.FontWeight="Bold" />
-                            </Grid>
-                        </Border>
-                        <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Background="#FFF0F0F0" Padding="10 0 0 0">
-
-                            <Border Background="#FFFFFF" BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Focusable="false" />
-                            </Border>
+                                           Style="{StaticResource OptionsToggleButtonStyle}"
+                                           ToolTip="Alphabetical">
+                                 <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/SortAscending16.png" Width="16" Height="16" />
+                              </RadioButton>
+                           </StackPanel>
+                        </Grid>
 
+                        <Border Grid.Column="1" Margin="4,4,0,4" Background="White" BorderBrush="Gray" BorderThickness="1" Visibility="{Binding ShowSearchBox, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                           <Grid>
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="*" />
+                                 <ColumnDefinition Width="Auto" />
+                              </Grid.ColumnDefinitions>
+                              <extToolkit:WatermarkTextBox x:Name="_txtFilter"
+                                                           Background="Transparent" 
+                                                           Text="{Binding Filter, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
+                                                           Watermark="{TemplateBinding FilterWatermark}">
+                                 <extToolkit:WatermarkTextBox.Style>
+                                    <Style TargetType="Control">
+                                       <Setter Property="BorderThickness" Value="0" />
+                                       <Style.Triggers>
+                                          <Trigger Property="IsMouseOver" Value="True">
+                                             <Setter Property="BorderThickness" Value="1" />
+                                          </Trigger>
+                                       </Style.Triggers>
+                                    </Style>
+                                 </extToolkit:WatermarkTextBox.Style>
+
+                              </extToolkit:WatermarkTextBox>
+
+                              <Button Grid.Column="1"
+                                      Command="commands:PropertyGridCommands.ClearFilter"
+                                      Style="{StaticResource ClearFilterButtonStyle}"
+                                      HorizontalAlignment="Left">
+                                 <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/ClearFilter16.png" Width="16" Height="16" />
+                              </Button>
+                           </Grid>
                         </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsExpanded" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style x:Key="PropertyExpanderStyle" TargetType="{x:Type Expander}">
-        <Setter Property="Padding" Value="10 0 0 0"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type Expander}">
-                    <Grid>
-                        <Border Visibility="Collapsed" Grid.Row="1" x:Name="ExpandSite" Padding="0 0 0 0">
-                            <Border BorderThickness="0" Margin="0" Padding="0" VerticalAlignment="Stretch" HorizontalAlignment="Stretch">
-                                <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-												  VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-												  Focusable="false" />
-                            </Border>
-                        </Border>
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsExpanded" Value="True">
-                            <Setter Property="Visibility" Value="Visible" TargetName="ExpandSite"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <ContextMenu x:Key="DefaultAdvancedOptionsMenu">
-        <MenuItem Header="Reset Value" Command="commands:PropertyItemCommands.ResetValue" />
-    </ContextMenu>
-
-    <Style TargetType="{x:Type local:PropertyItem}">
-        <Setter Property="BorderBrush" Value="#FFF0F0F0" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Focusable" Value="True"/>
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:PropertyItem}">
-                    <Border Background="White" ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PropertyGrid}}" ContextMenuService.Placement="Bottom">
-                        <Grid VerticalAlignment="Center" HorizontalAlignment="Stretch">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PropertyGrid}}}"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-                            <Grid.RowDefinitions>
-                                <RowDefinition />
-                                <RowDefinition />
-                            </Grid.RowDefinitions>
-
-                            <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Name">
-                                <Grid Margin="2,2,2,2">
-                                    <Grid.ColumnDefinitions>
-                                        <ColumnDefinition Width="*" />
-                                        <ColumnDefinition Width="Auto" />
-                                    </Grid.ColumnDefinitions>
-
-                                    <Grid Margin="{Binding Level, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ExpandableObjectMarginConverter}}">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="15" />
-                                            <ColumnDefinition Width="*" />
-                                        </Grid.ColumnDefinitions>
-
-                                        <Border Grid.Column="0" >
-                                            <ToggleButton Template="{StaticResource ExpanderToggleButton}" OverridesDefaultStyle="True"
-                                              IsChecked="{Binding IsExpanded, RelativeSource={RelativeSource TemplatedParent}}"
-                                              Visibility="{Binding HasChildProperties, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}"/>
-                                        </Border>
-
-                                        <TextBlock Grid.Column="1" Text="{Binding DisplayName, RelativeSource={RelativeSource TemplatedParent}}" HorizontalAlignment="Stretch" TextTrimming="CharacterEllipsis"/>
-                                    </Grid>
-
-                                    <Grid Grid.Column="1" HorizontalAlignment="Right" Margin="5,0,5,0"  Visibility="{Binding ShowAdvancedOptions, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PropertyGrid}, Converter={StaticResource BooleanToVisibilityConverter}}"
-                                          utilities:ContextMenuUtilities.OpenOnMouseLeftButtonClick="True"
-                                          ContextMenu="{Binding AdvancedOptionsMenu, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:PropertyGrid}}" >
-
-                                        <Image x:Name="_optionsImage" Width="11" Height="11"
-                                               Source="{Binding ValueSource, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ValueSourceToImagePathConverter}}"
-                                               ToolTip="{Binding ValueSource, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource ValueSourceToToolTipConverter}}" />
-                                    </Grid>
-                                </Grid>
-                            </Border>
-
-                            <Border BorderThickness="0.5" BorderBrush="#FFF0F0F0" x:Name="PART_Editor"  Grid.Column="1" Background="Transparent">
-                                <ContentControl Content="{TemplateBinding Editor}" VerticalAlignment="Center" Focusable="False" IsTabStop="False" />
-                            </Border>
-
-                            <Expander x:Name="_propertyExpander" Grid.ColumnSpan="2" Grid.Row="1" IsExpanded="{TemplateBinding IsExpanded}" Style="{StaticResource PropertyExpanderStyle}" IsEnabled="True">
-                                <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False" >
-                                    <ItemsControl.ItemsPanel>
-                                        <ItemsPanelTemplate>
-                                            <VirtualizingStackPanel />
-                                        </ItemsPanelTemplate>
-                                    </ItemsControl.ItemsPanel>
-                                </ItemsControl>
-                            </Expander>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <DataTrigger Binding="{Binding IsDataBound, RelativeSource={RelativeSource Self}}" Value="True">
-                            <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Database11.png" />
-                            <Setter TargetName="_optionsImage" Property="ToolTip" Value="Databinding" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding IsDynamicResource, RelativeSource={RelativeSource Self}}" Value="True">
-                            <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Resource11.png" />
-                            <Setter TargetName="_optionsImage" Property="ToolTip" Value="Resource" />
-                        </DataTrigger>
-                        <DataTrigger Binding="{Binding HasResourceApplied, RelativeSource={RelativeSource Self}}" Value="True">
-                            <Setter TargetName="_optionsImage" Property="Source" Value="/WPFToolkit.Extended;component/PropertyGrid/Images/Resource11.png" />
-                            <Setter TargetName="_optionsImage" Property="ToolTip" Value="Resource" />
-                        </DataTrigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="PART_Name" Property="Background" Value="#CED4DF" />
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="PART_Name" Property="Background" Value="#43577B" />
-                            <Setter TargetName="PART_Name" Property="TextElement.Foreground" Value="White" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type local:PropertyGrid}">
-        <Setter Property="AdvancedOptionsMenu" Value="{StaticResource DefaultAdvancedOptionsMenu}" />
-        <Setter Property="Background" Value="#CED4DF" />
-        <Setter Property="BorderBrush" Value="#43577B" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:PropertyGrid}">
-                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="Auto"/>
-                                <RowDefinition Height="Auto" />
-                                <RowDefinition />
-                                <RowDefinition Height="5" />
-                                <RowDefinition Height="Auto"/>
-                            </Grid.RowDefinitions>
-
-                            <StackPanel Orientation="Horizontal" Margin="6,2,0,4">
-                                <TextBlock Text="{TemplateBinding SelectedObjectTypeName}" FontWeight="Bold"/>
-                                <TextBlock Text="{TemplateBinding SelectedObjectName}" Margin="5,0,0,0" />
-                            </StackPanel>
-
-                            <Grid Grid.Row="1" Margin="4,0,4,4">
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="Auto"/>
-                                    <ColumnDefinition Width="*"/>
-                                </Grid.ColumnDefinitions>
-                                <Grid Background="#BCC7D8" Margin="4" Visibility="{Binding ShowSortOptions, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                    <StackPanel Orientation="Horizontal" Margin="1" >
-                                        <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" 
-                                                     Style="{StaticResource OptionsToggleButtonStyle}" ToolTip="Categorized">
-                                            <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/Categorize16.png" Width="16" Height="16" />
-                                        </RadioButton>
-                                        <RadioButton IsChecked="{Binding IsCategorized, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}, Mode=OneWay}" VerticalAlignment="Center" 
-                                                     Style="{StaticResource OptionsToggleButtonStyle}" ToolTip="Alphabetical">
-                                            <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/SortAscending16.png" Width="16" Height="16"/>
-                                        </RadioButton>
-                                    </StackPanel>
-                                </Grid>
-
-                                <Border Grid.Column="1" Margin="4,4,0,4" Background="White" BorderBrush="Gray" BorderThickness="1" Visibility="{Binding ShowSearchBox, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
-                                        </Grid.ColumnDefinitions>
-                                        <extToolkit:WatermarkTextBox x:Name="_txtFilter" Background="Transparent" 
-                                                                 Text="{Binding Filter, RelativeSource={RelativeSource TemplatedParent}, UpdateSourceTrigger=PropertyChanged}"
-                                                                 Watermark="{TemplateBinding FilterWatermark}">
-                                            <extToolkit:WatermarkTextBox.Style>
-                                                <Style TargetType="Control">
-                                                    <Setter Property="BorderThickness" Value="0" />
-                                                    <Style.Triggers>
-                                                        <Trigger Property="IsMouseOver" Value="True">
-                                                            <Setter Property="BorderThickness" Value="1" />
-                                                        </Trigger>
-                                                    </Style.Triggers>
-                                                </Style>
-                                            </extToolkit:WatermarkTextBox.Style>
-
-                                        </extToolkit:WatermarkTextBox>
-
-                                        <Button Grid.Column="1" Command="commands:PropertyGridCommands.ClearFilter" Style="{StaticResource ClearFilterButtonStyle}"
-                                                HorizontalAlignment="Left">
-                                            <Image Source="/WPFToolkit.Extended;component/PropertyGrid/Images/ClearFilter16.png" Width="16" Height="16"/>
-                                        </Button>
-                                    </Grid>
-                                </Border>
-                            </Grid>
-
-                            <Grid Grid.Row="2" Background="White">
-                                <ScrollViewer VerticalScrollBarVisibility="Auto">
-                                    <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False" >
-                                        <ItemsControl.ItemsPanel>
-                                            <ItemsPanelTemplate>
-                                                <VirtualizingStackPanel />
-                                            </ItemsPanelTemplate>
-                                        </ItemsControl.ItemsPanel>
-
-                                        <ItemsControl.GroupStyle>
-                                            <GroupStyle>
-                                                <GroupStyle.ContainerStyle>
-                                                    <Style TargetType="{x:Type GroupItem}">
-                                                        <Setter Property="Template">
-                                                            <Setter.Value>
-                                                                <ControlTemplate>
-                                                                    <Border Background="{TemplateBinding Background}"
-                                                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                                                            BorderThickness="{TemplateBinding BorderThickness}">
-                                                                        <Expander Header="{Binding Name}" Style="{StaticResource ExpanderStyle}" IsExpanded="True">
-                                                                            <ItemsPresenter />
-                                                                        </Expander>
-                                                                    </Border>
-                                                                </ControlTemplate>
-                                                            </Setter.Value>
-                                                        </Setter>
-                                                    </Style>
-                                                </GroupStyle.ContainerStyle>
-                                            </GroupStyle>
-                                        </ItemsControl.GroupStyle>
-
-                                    </ItemsControl>
-                                </ScrollViewer>
-
-                                <Thumb x:Name="PART_DragThumb" HorizontalAlignment="Left" Width="5" Margin="6,0,0,0" Cursor="SizeWE">
-                                    <Thumb.RenderTransform>
-                                        <TranslateTransform X="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PropertyGrid}}}" />
-                                    </Thumb.RenderTransform>
-                                    <Thumb.Template>
-                                        <ControlTemplate>
-                                            <Border Background="Transparent" />
-                                        </ControlTemplate>
-                                    </Thumb.Template>
-                                </Thumb>
-
-                            </Grid>
-
-                            <GridSplitter Height="3" Grid.Row="3" HorizontalAlignment="Stretch" Visibility="{Binding DisplaySummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
-                            <StackPanel Grid.Row="4" Margin="0,0,0,5" Visibility="{Binding DisplaySummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
-                                <TextBlock Padding="2 2 2 0" FontWeight="Bold" Text="{Binding SelectedProperty.DisplayName, RelativeSource={RelativeSource TemplatedParent}}" />
-                                <TextBlock Padding="5 2 2 0" TextWrapping="WrapWithOverflow" Text="{Binding SelectedProperty.Description, RelativeSource={RelativeSource TemplatedParent}}" />
-                            </StackPanel>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                     </Grid>
+
+                     <Grid Grid.Row="2" Background="White">
+                        <ScrollViewer VerticalScrollBarVisibility="Auto">
+                           <ItemsControl ItemsSource="{Binding Properties, RelativeSource={RelativeSource TemplatedParent}}" IsTabStop="False" Focusable="False">
+                              <ItemsControl.ItemsPanel>
+                                 <ItemsPanelTemplate>
+                                    <VirtualizingStackPanel />
+                                 </ItemsPanelTemplate>
+                              </ItemsControl.ItemsPanel>
+
+                              <ItemsControl.GroupStyle>
+                                 <GroupStyle>
+                                    <GroupStyle.ContainerStyle>
+                                       <Style TargetType="{x:Type GroupItem}">
+                                          <Setter Property="Template">
+                                             <Setter.Value>
+                                                <ControlTemplate>
+                                                   <Border Background="{TemplateBinding Background}"
+                                                           BorderBrush="{TemplateBinding BorderBrush}"
+                                                           BorderThickness="{TemplateBinding BorderThickness}">
+                                                      <Expander Header="{Binding Name}" Style="{StaticResource ExpanderStyle}" IsExpanded="True">
+                                                         <ItemsPresenter />
+                                                      </Expander>
+                                                   </Border>
+                                                </ControlTemplate>
+                                             </Setter.Value>
+                                          </Setter>
+                                       </Style>
+                                    </GroupStyle.ContainerStyle>
+                                 </GroupStyle>
+                              </ItemsControl.GroupStyle>
+
+                           </ItemsControl>
+                        </ScrollViewer>
+
+                        <Thumb x:Name="PART_DragThumb" HorizontalAlignment="Left" Width="5" Margin="6,0,0,0" Cursor="SizeWE">
+                           <Thumb.RenderTransform>
+                              <TranslateTransform X="{Binding NameColumnWidth, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type local:PropertyGrid}}}" />
+                           </Thumb.RenderTransform>
+                           <Thumb.Template>
+                              <ControlTemplate>
+                                 <Border Background="Transparent" />
+                              </ControlTemplate>
+                           </Thumb.Template>
+                        </Thumb>
+
+                     </Grid>
+
+                     <GridSplitter Height="3" Grid.Row="3" HorizontalAlignment="Stretch" Visibility="{Binding DisplaySummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}" />
+                     <StackPanel Grid.Row="4" Margin="0,0,0,5" Visibility="{Binding DisplaySummary, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource BooleanToVisibilityConverter}}">
+                        <TextBlock Padding="2 2 2 0" FontWeight="Bold" Text="{Binding SelectedProperty.DisplayName, RelativeSource={RelativeSource TemplatedParent}}" />
+                        <TextBlock Padding="5 2 2 0" TextWrapping="WrapWithOverflow" Text="{Binding SelectedProperty.Description, RelativeSource={RelativeSource TemplatedParent}}" />
+                     </StackPanel>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml
index badaf914..1809b7d4 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/SplitButton/Themes/Generic.xaml
@@ -1,108 +1,128 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
 
-    <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="ColorPickerDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
 
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <!-- =============================================================================== -->
-    <!-- SplitButton                                                                     -->
-    <!-- =============================================================================== -->
+   <!-- =============================================================================== -->
+   <!-- SplitButton                                                                     -->
+   <!-- =============================================================================== -->
 
-    <Style TargetType="{x:Type local:SplitButton}">
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="IsTabStop" Value="False" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
-        <Setter Property="Padding" Value="3"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:SplitButton}">
-                    <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
-                        <chrome:ButtonChrome x:Name="ControlChrome" Background="{TemplateBinding Background}" RenderEnabled="{TemplateBinding IsEnabled}" CornerRadius="2.75">
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <Button x:Name="PART_ActionButton" Margin="0" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" >
-                                    <Button.Template>
-                                        <ControlTemplate TargetType="Button">
-                                            <ContentPresenter />
-                                        </ControlTemplate>
-                                    </Button.Template>
-                                    <Grid>
-                                        <chrome:ButtonChrome x:Name="ActionButtonChrome"
-                                                         CornerRadius="2.75, 0, 0, 2.75"                                                         
-                                                         RenderNormal="False"
-                                                         RenderEnabled="{TemplateBinding IsEnabled}"
-											             RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
-											             RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}" >
-                                            <ContentPresenter Name="ActionButtonContent" Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
-                                        </chrome:ButtonChrome>
-                                    </Grid>
-                                </Button>
-                                <ToggleButton x:Name="PART_ToggleButton" Grid.Column="1" IsTabStop="False"
-                                                  IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
-                                                  IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" >
-                                    <ToggleButton.Template>
-                                        <ControlTemplate TargetType="ToggleButton">
-                                            <ContentPresenter />
-                                        </ControlTemplate>
-                                    </ToggleButton.Template>
-                                    <Grid>
-                                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"                                                         
-                                                         CornerRadius="0, 2.75, 2.75, 0"
-                                                         RenderNormal="False"
-                                                         RenderChecked="{TemplateBinding IsOpen}"
-                                                         RenderEnabled="{TemplateBinding IsEnabled}"
-											             RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
-											             RenderPressed="{Binding IsPressed, ElementName=PART_ToggleButton}" >
-                                            <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3">
-                                                <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                            </Grid>
-                                        </chrome:ButtonChrome>
-                                    </Grid>
-                                </ToggleButton>
-                            </Grid>
-                        </chrome:ButtonChrome>
+   <Style TargetType="{x:Type local:SplitButton}">
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="IsTabStop" Value="False" />
+      <Setter Property="HorizontalContentAlignment" Value="Center" />
+      <Setter Property="VerticalContentAlignment" Value="Center" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:SplitButton}">
+               <Grid x:Name="MainGrid" SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ControlChrome" Background="{TemplateBinding Background}" RenderEnabled="{TemplateBinding IsEnabled}" CornerRadius="2.75">
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <Button x:Name="PART_ActionButton" Margin="0" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Padding="{TemplateBinding Padding}" >
+                           <Button.Template>
+                              <ControlTemplate TargetType="Button">
+                                 <ContentPresenter />
+                              </ControlTemplate>
+                           </Button.Template>
+                           <Grid>
+                              <chrome:ButtonChrome x:Name="ActionButtonChrome"
+                                                   CornerRadius="2.75, 0, 0, 2.75"                                                         
+                                                   RenderNormal="False"
+                                                   RenderEnabled="{TemplateBinding IsEnabled}"
+											                  RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ActionButton}"
+											                  RenderPressed="{Binding IsPressed, ElementName=PART_ActionButton}">
+                                 <ContentPresenter Name="ActionButtonContent" Margin="{TemplateBinding Padding}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" RecognizesAccessKey="true" />
+                              </chrome:ButtonChrome>
+                           </Grid>
+                        </Button>
+                        <ToggleButton x:Name="PART_ToggleButton"
+                                      Grid.Column="1"
+                                      IsTabStop="False"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Mode=TwoWay}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}">
+                           <ToggleButton.Template>
+                              <ControlTemplate TargetType="ToggleButton">
+                                 <ContentPresenter />
+                              </ControlTemplate>
+                           </ToggleButton.Template>
+                           <Grid>
+                              <chrome:ButtonChrome x:Name="ToggleButtonChrome"                                                         
+                                                   CornerRadius="0, 2.75, 2.75, 0"
+                                                   RenderNormal="False"
+                                                   RenderChecked="{TemplateBinding IsOpen}"
+                                                   RenderEnabled="{TemplateBinding IsEnabled}"
+											                  RenderMouseOver="{Binding IsMouseOver, ElementName=PART_ToggleButton}"
+											                  RenderPressed="{Binding IsPressed, ElementName=PART_ToggleButton}">
+                                 <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Margin="4,3,4,3">
+                                    <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
+                                 </Grid>
+                              </chrome:ButtonChrome>
+                           </Grid>
+                        </ToggleButton>
+                     </Grid>
+                  </chrome:ButtonChrome>
 
-                        <Popup x:Name="PART_Popup" 
-                               HorizontalOffset="1"
-                               VerticalOffset="1"
-                               AllowsTransparency="True"
-                               StaysOpen="False"
-                               Placement="Bottom"
-                               Focusable="False"
-                               IsOpen="{Binding IsChecked, ElementName=PART_ToggleButton}">
-                            <!-- TODO: Create Popup Styles that can be reused on all popups in the toolkit-->
-                            <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource ColorPickerDarkBorderBrush}" >
-                                <ContentPresenter Content="{TemplateBinding DropDownContent}" />
-                            </Border>
-                        </Popup>
+                  <Popup x:Name="PART_Popup" 
+                         HorizontalOffset="1"
+                         VerticalOffset="1"
+                         AllowsTransparency="True"
+                         StaysOpen="False"
+                         Placement="Bottom"
+                         Focusable="False"
+                         IsOpen="{Binding IsChecked, ElementName=PART_ToggleButton}">
+                     <!-- TODO: Create Popup Styles that can be reused on all popups in the toolkit-->
+                     <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource ColorPickerDarkBorderBrush}">
+                        <ContentPresenter Content="{TemplateBinding DropDownContent}" />
+                     </Border>
+                  </Popup>
 
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml
index b278e217..af6056fa 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero.NormalColor.xaml
@@ -1,9 +1,27 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
 
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Aero/Brushes_NormalColor.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Aero/Buttons_NormalColor.xaml" />
-    </ResourceDictionary.MergedDictionaries>    
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Aero/Brushes_NormalColor.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Aero/Buttons_NormalColor.xaml" />
+   </ResourceDictionary.MergedDictionaries>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml
index 746a159a..ca6d0cdd 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Brushes_NormalColor.xaml
@@ -1,118 +1,136 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
                     xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes" >
 
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFF" PresentationOptions:Freeze="true"/>
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#F4F4F4" PresentationOptions:Freeze="true"/>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FFabadb3" Offset="0" />
-                <GradientStop Color="#FFdbdfe6" Offset="0.05000000074505806" />
-                <GradientStop Color="#FFdbdfe6" Offset="0.949999988079071" />
-                <GradientStop Color="#FFe3e9ef" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true" >
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FF3d7bad" Offset="0" />
-                <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
-                <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
-                <GradientStop Color="#FFb7d9ed" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FF3d7bad" Offset="0" />
-                <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
-                <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
-                <GradientStop Color="#FFb7d9ed" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFF" PresentationOptions:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#F4F4F4" PresentationOptions:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFabadb3" Offset="0" />
+            <GradientStop Color="#FFdbdfe6" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFdbdfe6" Offset="0.949999988079071" />
+            <GradientStop Color="#FFe3e9ef" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF3d7bad" Offset="0" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
+            <GradientStop Color="#FFb7d9ed" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1" PresentationOptions:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF3d7bad" Offset="0" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
+            <GradientStop Color="#FFb7d9ed" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FFABADB3" />
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFfcfcfc" />
+            <GradientStop Offset="0.69" Color="#FFf9f9f9" />
+            <GradientStop Offset="0.69" Color="#FFf3f3f3" />
+            <GradientStop Offset="1" Color="#FFf3f3f3" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFf2f2f2" />
+            <GradientStop Offset="0.69" Color="#FFe8e8e8" />
+            <GradientStop Offset="0.69" Color="#FFd1d1d1" />
+            <GradientStop Offset="1" Color="#FFd1d1d1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FFABADB3"/>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFfcfcfc"/>
-                <GradientStop Offset="0.69" Color="#FFf9f9f9"/>
-                <GradientStop Offset="0.69" Color="#FFf3f3f3"/>
-                <GradientStop Offset="1" Color="#FFf3f3f3"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFf2f2f2"/>
-                <GradientStop Offset="0.69" Color="#FFe8e8e8"/>
-                <GradientStop Offset="0.69" Color="#FFd1d1d1"/>
-                <GradientStop Offset="1" Color="#FFd1d1d1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#FF3C7FB1" />
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFfafdfe" Offset="0" />
+            <GradientStop Color="#FFf5fbfe" Offset="0.5" />
+            <GradientStop Color="#FFeff9fe" Offset="0.5009999871253967" />
+            <GradientStop Color="#FFe8f5fc" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFeaf6fd" Offset="0" />
+            <GradientStop Color="#FFd9f0fc" Offset="0.5" />
+            <GradientStop Color="#FFbee6fd" Offset="0.5009999871253967" />
+            <GradientStop Color="#FFa7d9f5" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#FF3C7FB1"/>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FFfafdfe" Offset="0" />
-                <GradientStop Color="#FFf5fbfe" Offset="0.5" />
-                <GradientStop Color="#FFeff9fe" Offset="0.5009999871253967" />
-                <GradientStop Color="#FFe8f5fc" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FFeaf6fd" Offset="0" />
-                <GradientStop Color="#FFd9f0fc" Offset="0.5" />
-                <GradientStop Color="#FFbee6fd" Offset="0.5009999871253967" />
-                <GradientStop Color="#FFa7d9f5" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#FF2C628B" />
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF9eb0ba" Offset="0" />
+            <GradientStop Color="#FF9abacb" Offset="0.5" />
+            <GradientStop Color="#FF78aac5" Offset="0.5008999705314636" />
+            <GradientStop Color="#FF5a96b8" Offset="0.8999999761581421" />
+            <GradientStop Color="#FF68b2da" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFe5f4fc" Offset="0" />
+            <GradientStop Color="#FFc4e5f6" Offset="0.5" />
+            <GradientStop Color="#FF98d1ef" Offset="0.5009999871253967" />
+            <GradientStop Color="#FF68b3db" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#FF2C628B"/>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FF9eb0ba" Offset="0" />
-                <GradientStop Color="#FF9abacb" Offset="0.5" />
-                <GradientStop Color="#FF78aac5" Offset="0.5008999705314636" />
-                <GradientStop Color="#FF5a96b8" Offset="0.8999999761581421" />
-                <GradientStop Color="#FF68b2da" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FFe5f4fc" Offset="0" />
-                <GradientStop Color="#FFc4e5f6" Offset="0.5" />
-                <GradientStop Color="#FF98d1ef" Offset="0.5009999871253967" />
-                <GradientStop Color="#FF68b3db" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FF3d7bad" Offset="0" />
-                <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
-                <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
-                <GradientStop Color="#FFb7d9ed" Offset="1" />
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FF3d7bad" Offset="0" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.05000000074505806" />
+            <GradientStop Color="#FFa4c9e3" Offset="0.949999988079071" />
+            <GradientStop Color="#FFb7d9ed" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml
index 5c5f8835..f5c772e0 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Aero/Buttons_NormalColor.xaml
@@ -1,32 +1,52 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes">
 
-    <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
-        <Setter Property="Background" Value="Transparent"/>
-        <Setter Property="BorderBrush" Value="Transparent"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="2,2"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="RepeatButton">
-                    <Grid>
-                        <chrome:ButtonChrome x:Name="Chrome"
-                                             BorderBrush="{TemplateBinding BorderBrush}" 
-                                             Background="{TemplateBinding Background}"                                                                  
-                                             CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
-                                             RenderEnabled="{TemplateBinding IsEnabled}"
-                                             RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                             RenderNormal="False"
-                                             RenderPressed="{TemplateBinding IsPressed}"
-                                             SnapsToDevicePixels="true" />
-
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
+      <Setter Property="Background" Value="Transparent" />
+      <Setter Property="BorderBrush" Value="Transparent" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Padding" Value="2,2" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="RepeatButton">
+               <Grid>
+                  <chrome:ButtonChrome x:Name="Chrome"
+                                       BorderBrush="{TemplateBinding BorderBrush}" 
+                                       Background="{TemplateBinding Background}"                                                                  
+                                       CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
+                                       RenderEnabled="{TemplateBinding IsEnabled}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderNormal="False"
+                                       RenderPressed="{TemplateBinding IsPressed}"
+                                       SnapsToDevicePixels="true" />
+
+                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Margin="{TemplateBinding Padding}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml
index 230c491c..e324c5ea 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic.xaml
@@ -1,36 +1,54 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <ResourceDictionary.MergedDictionaries>
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Brushes.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Buttons.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Common.xaml" />
-
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Chromes/Themes/Generic.xaml" />
-
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/BusyIndicator/Themes/Generic.xaml" />
-
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/ButtonSpinner/Themes/Generic.xaml" />
-
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Calculator/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/CalculatorUpDown/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/CheckComboBox/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/CheckListBox/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/ChildWindow/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/CollectionEditors/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/ColorCanvas/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/ColorPicker/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/DropDownButton/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Magnifier/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/MessageBox/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/DateTimeUpDown/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/DateTimePicker/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/NumericUpDown/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/SplitButton/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/PropertyGrid/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/TimePicker/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/TokenizedTextBox/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/WatermarkTextBox/Themes/Generic.xaml" />
-        <ResourceDictionary Source="/WPFToolkit.Extended;component/Wizard/Themes/Generic.xaml" />
-    </ResourceDictionary.MergedDictionaries>
+   <ResourceDictionary.MergedDictionaries>
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Brushes.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Buttons.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Themes/Generic/Common.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Chromes/Themes/Generic.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/BusyIndicator/Themes/Generic.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ButtonSpinner/Themes/Generic.xaml" />
+
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Calculator/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CalculatorUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CheckComboBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CheckListBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ChildWindow/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/CollectionEditors/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ColorCanvas/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/ColorPicker/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/DropDownButton/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Magnifier/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/MessageBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/DateTimeUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/DateTimePicker/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/MultiLineTextEditor/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/NumericUpDown/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/SplitButton/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/PropertyGrid/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/TimePicker/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/TokenizedTextBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/WatermarkTextBox/Themes/Generic.xaml" />
+      <ResourceDictionary Source="/WPFToolkit.Extended;component/Wizard/Themes/Generic.xaml" />
+   </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml
index 2c6d59ea..95a77bef 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Brushes.xaml
@@ -1,111 +1,128 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:PresentationOptions="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
                     xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes">
 
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFFFF" PresentationOptions:Freeze="true"/>
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#F4F4F4" PresentationOptions:Freeze="true"/>
-
-
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0"  PresentationOptions:Freeze="true">
-        <GradientStop Color="#ABADB3" Offset="0.05"/>
-        <GradientStop Color="#E2E3EA" Offset="0.07"/>
-        <GradientStop Color="#E3E9EF" Offset="1"/>
-    </LinearGradientBrush>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" StartPoint="0,0" EndPoint="0,1" PresentationOptions:Freeze="true" >
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#5794BF" Offset="0.05"/>
-                <GradientStop Color="#B7D5EA" Offset="0.07"/>
-                <GradientStop Color="#C7E2F1" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>       
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" StartPoint="0,0" EndPoint="0,1" PresentationOptions:Freeze="true">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#3D7BAD" Offset="0.05"/>
-                <GradientStop Color="#A4C9E3" Offset="0.07"/>
-                <GradientStop Color="#B7D9ED" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    
-
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FF707070" PresentationOptions:Freeze="true"/>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}" EndPoint="0,1" StartPoint="0,0" PresentationOptions:Freeze="true">
-        <GradientStop Color="#FAFFFFFF" Offset="0"/>
-        <GradientStop Color="#85FFFFFF" Offset="1"/>
-    </LinearGradientBrush>    
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#F3F3F3" Offset="0"/>
-                <GradientStop Color="#EBEBEB" Offset="0.5"/>
-                <GradientStop Color="#DDDDDD" Offset="0.5"/>
-                <GradientStop Color="#CDCDCD" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#3C7FB1"/>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FAFFFFFF" Offset="0"/>
-                <GradientStop Color="#85FFFFFF" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FFEAF6FD" Offset="0"/>
-                <GradientStop Color="#FFD9F0FC" Offset="0.50"/>
-                <GradientStop Color="#FFBEE6FD" Offset="0.50"/>
-                <GradientStop Color="#FFA7D9F5" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#2C628B"/>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#FAFFFFFF" Offset="0"/>
-                <GradientStop Color="#85FFFFFF" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-    <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Color="#C2E4F6" Offset="0.5"/>
-                <GradientStop Color="#ABDAF3" Offset="0.5"/>
-                <GradientStop Color="#90CBEB" Offset="1"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" Color="#FF707070" PresentationOptions:Freeze="true"/>
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedInnerBorderKey}" Color="#F900CCFF" PresentationOptions:Freeze="true"/>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}" EndPoint="0,1" StartPoint="0,0" PresentationOptions:Freeze="true">
-        <GradientStop Color="#FFEAF6FD" Offset="0"/>
-        <GradientStop Color="#FFD9F0FC" Offset="0.50"/>
-        <GradientStop Color="#FFBEE6FD" Offset="0.50"/>
-        <GradientStop Color="#FFA7D9F5" Offset="1"/>
-    </LinearGradientBrush>
-
-    <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}" Color="#ADB2B5" PresentationOptions:Freeze="true"/>
-    <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonInnerBorderDisabledKey}" EndPoint="0,1" StartPoint="0,0" PresentationOptions:Freeze="true">
-        <GradientStop Color="#FAFFFFFF" Offset="0"/>
-        <GradientStop Color="#85FFFFFF" Offset="1"/>
-    </LinearGradientBrush>
-
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphNormalForegroundKey}" Color="#FF000000" />
-    <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}" Color="#A9A9A9" />
-    
-    <CornerRadius x:Key="{x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}" TopLeft="0" TopRight="0" BottomRight="0" BottomLeft="0" PresentationOptions:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBackgroundKey}" Color="#FFFFFFFF" PresentationOptions:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ControlDisabledBackgroundKey}" Color="#F4F4F4" PresentationOptions:Freeze="true" />
+
+
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlNormalBorderKey}" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0"  PresentationOptions:Freeze="true">
+      <GradientStop Color="#ABADB3" Offset="0.05" />
+      <GradientStop Color="#E2E3EA" Offset="0.07" />
+      <GradientStop Color="#E3E9EF" Offset="1" />
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlMouseOverBorderKey}" StartPoint="0,0" EndPoint="0,1" PresentationOptions:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#5794BF" Offset="0.05" />
+            <GradientStop Color="#B7D5EA" Offset="0.07" />
+            <GradientStop Color="#C7E2F1" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ControlFocusedBorderKey}" StartPoint="0,0" EndPoint="0,1" PresentationOptions:Freeze="true">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#3D7BAD" Offset="0.05" />
+            <GradientStop Color="#A4C9E3" Offset="0.07" />
+            <GradientStop Color="#B7D9ED" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalOuterBorderKey}" Color="#FF707070" PresentationOptions:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonNormalInnerBorderKey}" EndPoint="0,1" StartPoint="0,0" PresentationOptions:Freeze="true">
+      <GradientStop Color="#FAFFFFFF" Offset="0" />
+      <GradientStop Color="#85FFFFFF" Offset="1" />
+   </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonNormalBackgroundKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#F3F3F3" Offset="0" />
+            <GradientStop Color="#EBEBEB" Offset="0.5" />
+            <GradientStop Color="#DDDDDD" Offset="0.5" />
+            <GradientStop Color="#CDCDCD" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverOuterBorderKey}" Color="#3C7FB1" />
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverInnerBorderKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FAFFFFFF" Offset="0" />
+            <GradientStop Color="#85FFFFFF" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonMouseOverBackgroundKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FFEAF6FD" Offset="0" />
+            <GradientStop Color="#FFD9F0FC" Offset="0.50" />
+            <GradientStop Color="#FFBEE6FD" Offset="0.50" />
+            <GradientStop Color="#FFA7D9F5" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedOuterBorderKey}" Color="#2C628B" />
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedInnerBorderKey}" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#FAFFFFFF" Offset="0" />
+            <GradientStop Color="#85FFFFFF" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+   <LinearGradientBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.ButtonPressedBackgroundKey}" StartPoint="0.5,0" EndPoint="0.5,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Color="#C2E4F6" Offset="0.5" />
+            <GradientStop Color="#ABDAF3" Offset="0.5" />
+            <GradientStop Color="#90CBEB" Offset="1" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedOuterBorderKey}" Color="#FF707070" PresentationOptions:Freeze="true" />
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedInnerBorderKey}" Color="#F900CCFF" PresentationOptions:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonFocusedBackgroundKey}" EndPoint="0,1" StartPoint="0,0" PresentationOptions:Freeze="true">
+      <GradientStop Color="#FFEAF6FD" Offset="0" />
+      <GradientStop Color="#FFD9F0FC" Offset="0.50" />
+      <GradientStop Color="#FFBEE6FD" Offset="0.50" />
+      <GradientStop Color="#FFA7D9F5" Offset="1" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="{x:Static themes:ResourceKeys.ButtonDisabledOuterBorderKey}" Color="#ADB2B5" PresentationOptions:Freeze="true" />
+   <LinearGradientBrush x:Key="{x:Static themes:ResourceKeys.ButtonInnerBorderDisabledKey}" EndPoint="0,1" StartPoint="0,0" PresentationOptions:Freeze="true">
+      <GradientStop Color="#FAFFFFFF" Offset="0" />
+      <GradientStop Color="#85FFFFFF" Offset="1" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphNormalForegroundKey}" Color="#FF000000" />
+   <SolidColorBrush PresentationOptions:Freeze="true" x:Key="{x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}" Color="#A9A9A9" />
+
+   <CornerRadius x:Key="{x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}" TopLeft="0" TopRight="0" BottomRight="0" BottomLeft="0" PresentationOptions:Freeze="true" />
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml
index b0fafa10..0c213b41 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Buttons.xaml
@@ -1,30 +1,50 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes">
 
-    <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="2,2"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="RepeatButton">
-                    <Grid>
-                        <chrome:ButtonChrome x:Name="Chrome"
-                                             BorderBrush="{TemplateBinding BorderBrush}" 
-                                             Background="{TemplateBinding Background}"                                                                  
-                                             CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
-                                             RenderEnabled="{TemplateBinding IsEnabled}"
-                                             RenderMouseOver="{TemplateBinding IsMouseOver}"
-                                             RenderNormal="True"
-                                             RenderPressed="{TemplateBinding IsPressed}"
-                                             SnapsToDevicePixels="true" />
-
-                        <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Margin="{TemplateBinding Padding}"/>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <Style x:Key="{x:Static themes:ResourceKeys.SpinnerButtonStyleKey}" TargetType="RepeatButton">
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Padding" Value="2,2" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="RepeatButton">
+               <Grid>
+                  <chrome:ButtonChrome x:Name="Chrome"
+                                       BorderBrush="{TemplateBinding BorderBrush}" 
+                                       Background="{TemplateBinding Background}"                                                                  
+                                       CornerRadius="{DynamicResource {x:Static themes:ResourceKeys.SpinButtonCornerRadiusKey}}"
+                                       RenderEnabled="{TemplateBinding IsEnabled}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderNormal="True"
+                                       RenderPressed="{TemplateBinding IsPressed}"
+                                       SnapsToDevicePixels="true" />
+
+                  <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    Margin="{TemplateBinding Padding}" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml
index 555f772a..52ac1056 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Common.xaml
@@ -1,4 +1,22 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" 
                     xmlns:sys="clr-namespace:System;assembly=mscorlib" 
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
@@ -7,129 +25,131 @@
                     xmlns:magConverters="clr-namespace:Microsoft.Windows.Controls.Mag.Converters"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes">
 
-    <!-- =============================================================================== -->
-    <!-- Common Styles                                                                   -->
-    <!-- Need to find a way to share these for ChildWIndow and MessageBox                -->
-    <!-- =============================================================================== -->
-
-    <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="0.479" Color="#FFf4f5f6"/>
-                <GradientStop Offset="1" Color="#FFd0d6db"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFb5bdc8"/>
-                <GradientStop Offset="0.370" Color="#FF8399a9"/>
-                <GradientStop Offset="0.370" Color="#FF718597"/>
-                <GradientStop Offset="0.906" Color="#FFb9c1ca"/>
-                <GradientStop Offset="1" Color="#FFb9c1ca"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FF6b7c8d"/>
-                <GradientStop Offset="0.370" Color="#FF4d606f"/>
-                <GradientStop Offset="0.370" Color="#FF465460"/>
-                <GradientStop Offset="0.906" Color="#FF262d33"/>
-                <GradientStop Offset="1" Color="#FF262d33"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
-        <Setter Property="Foreground" Value="#FF000000"/>
-        <Setter Property="Padding" Value="3"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="Button">
-                    <Grid>
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal"/>
-                                <VisualState x:Name="MouseOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}"></DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}"></DiscreteObjectKeyFrame>
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                        <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
-                            <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0"/>
-                        </Border>
-                        <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}"/>
-                        <Path x:Name="path"
-								Height="6"
-								Width="7"
-								Stretch="Fill"
-								Opacity="1"
-								Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
-								Fill="White" Margin="0,0,0,1" Visibility="Collapsed" />
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-
-    <!-- =============================================================================== -->
-    <!-- SelectorItem                                                                    -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type primitives:SelectorItem}">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
-                    <Border x:Name="_background"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*" />
-                            </Grid.ColumnDefinitions>
-                            <CheckBox Name="PART_CheckBox" IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Focusable="False"  Margin="3,1,5,1"/>
-                            <Border Grid.Column="1">
-                                <ContentPresenter Margin="2" ContentSource="Content" />
-                            </Border>
-                        </Grid>
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="true">
-                            <Setter TargetName="_background" Property="Background" Value="Blue"/>
-                            <Setter Property="Foreground" Value="White"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <!-- =============================================================================== -->
+   <!-- Common Styles                                                                   -->
+   <!-- Need to find a way to share these for ChildWIndow and MessageBox                -->
+   <!-- =============================================================================== -->
+
+   <LinearGradientBrush x:Key="WindowDarkBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="0.479" Color="#FFf4f5f6" />
+            <GradientStop Offset="1" Color="#FFd0d6db" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonHoverBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFb5bdc8" />
+            <GradientStop Offset="0.370" Color="#FF8399a9" />
+            <GradientStop Offset="0.370" Color="#FF718597" />
+            <GradientStop Offset="0.906" Color="#FFb9c1ca" />
+            <GradientStop Offset="1" Color="#FFb9c1ca" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="WindowButtonPressedBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FF6b7c8d" />
+            <GradientStop Offset="0.370" Color="#FF4d606f" />
+            <GradientStop Offset="0.370" Color="#FF465460" />
+            <GradientStop Offset="0.906" Color="#FF262d33" />
+            <GradientStop Offset="1" Color="#FF262d33" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="WindowCloseButtonStyle" TargetType="Button">
+      <Setter Property="Foreground" Value="#FF000000" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="Button">
+               <Grid>
+                  <VisualStateManager.VisualStateGroups>
+                     <VisualStateGroup x:Name="CommonStates">
+                        <VisualState x:Name="Normal" />
+                        <VisualState x:Name="MouseOver">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonHoverBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                        <VisualState x:Name="Pressed">
+                           <Storyboard>
+                              <ObjectAnimationUsingKeyFrames BeginTime="00:00:00" Duration="00:00:00.0010000" Storyboard.TargetName="Background" Storyboard.TargetProperty="(Border.Background)">
+                                 <DiscreteObjectKeyFrame KeyTime="00:00:00" Value="{StaticResource WindowButtonPressedBrush}" />
+                              </ObjectAnimationUsingKeyFrames>
+                           </Storyboard>
+                        </VisualState>
+                     </VisualStateGroup>
+                  </VisualStateManager.VisualStateGroups>
+                  <Border x:Name="Background" CornerRadius="0,0,2,0" Background="{StaticResource WindowDarkBrush}">
+                     <Border Margin="1,0,1,1" BorderBrush="#59FFFFFF" BorderThickness="1" CornerRadius="0,0,1,0" />
+                  </Border>
+                  <ContentPresenter x:Name="contentPresenter" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+                  <Path x:Name="path"
+                        Height="6"
+                        Width="7"
+                        Stretch="Fill"
+                        Opacity="1"
+                        Data="M 2,6 C2,6 3,6 3,6 3,6 3,5 3,5 3,5 4,5 4,5 4,5 4,6 4,6 4,6 5,6 5,6 5,6 7,6 7,6 7,6 7,5 7,5 7,5 6,5 6,5 6,5 6,4 6,4 6,4 5,4 5,4 5,4 5,2 5,2 5,2 6,2 6,2 6,2 6,1 6,1 6,1 7,1 7,1 7,1 7,0 7,0 7,0 5,0 5,0 5,0 4,0 4,0 4,0 4,1 4,1 4,1 3,1 3,1 3,1 3,0 3,0 3,0 2,0 2,0 2,0 0,0 0,0 0,0 0,1 0,1 0,1 1,1 1,1 1,1 1,2 1,2 1,2 2,2 2,2 2,2 2,4 2,4 2,4 1,4 1,4 1,4 1,5 1,5 1,5 0,5 0,5 0,5 0,6 0,6 0,6 2,6 2,6 z"
+                        Fill="White"
+                        Margin="0,0,0,1"
+                        Visibility="Collapsed" />
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+
+   <!-- =============================================================================== -->
+   <!-- SelectorItem                                                                    -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type primitives:SelectorItem}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type primitives:SelectorItem}">
+               <Border x:Name="_background"
+                       Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="Auto" />
+                        <ColumnDefinition Width="*" />
+                     </Grid.ColumnDefinitions>
+                     <CheckBox Name="PART_CheckBox" IsChecked="{Binding IsSelected, RelativeSource={RelativeSource TemplatedParent}}" VerticalAlignment="Center" Focusable="False"  Margin="3,1,5,1" />
+                     <Border Grid.Column="1">
+                        <ContentPresenter Margin="2" ContentSource="Content" />
+                     </Border>
+                  </Grid>
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="true">
+                     <Setter TargetName="_background" Property="Background" Value="Blue" />
+                     <Setter Property="Foreground" Value="White" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml
index 4470f70f..2ef3a96e 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Themes/Generic/Glyphs.xaml
@@ -1,47 +1,69 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes" >
+                    xmlns:themes="clr-namespace:Microsoft.Windows.Controls.Themes">
 
-    <Geometry x:Key="UpArrowGeometry">M 0,3 C0,3 0,4 0,4 0,4 3,4 3,4 3,4 3,3 3,3 3,3 4,3 4,3 4,3 4,4 4,4 4,4 7,4 7,4 7,4 7,3 7,3 7,3 6,3 6,3 6,3 6,2 6,2 6,2 5,2 5,2 5,2 5,1 5,1 5,1 4,1 4,1 4,1 4,0 4,0 4,0 3,0 3,0 3,0 3,1 3,1 3,1 2,1 2,1 2,1 2,2 2,2 2,2 1,2 1,2 1,2 1,3 1,3 1,3 0,3 0,3 z</Geometry>
-    <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
+   <Geometry x:Key="UpArrowGeometry">M 0,3 C0,3 0,4 0,4 0,4 3,4 3,4 3,4 3,3 3,3 3,3 4,3 4,3 4,3 4,4 4,4 4,4 7,4 7,4 7,4 7,3 7,3 7,3 6,3 6,3 6,3 6,2 6,2 6,2 5,2 5,2 5,2 5,1 5,1 5,1 4,1 4,1 4,1 4,0 4,0 4,0 3,0 3,0 3,0 3,1 3,1 3,1 2,1 2,1 2,1 2,2 2,2 2,2 1,2 1,2 1,2 1,3 1,3 1,3 0,3 0,3 z</Geometry>
+   <Geometry x:Key="DownArrowGeometry">M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z</Geometry>
 
-    <DataTemplate x:Key="IncreaseGlyphNormalKey">
-        <Path
-			Width="7"
-			Height="4"
-			Data="{StaticResource UpArrowGeometry}"
-			Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
+   <DataTemplate x:Key="IncreaseGlyphNormalKey">
+      <Path Width="7"
+            Height="4"
+            Data="{StaticResource UpArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
             SnapsToDevicePixels="True"
-             HorizontalAlignment="Center" VerticalAlignment="Center" Focusable="False" />
-    </DataTemplate>
-    <DataTemplate x:Key="IncreaseGlyphDisabledKey">
-        <Path
-			Width="7"
-			Height="4"
-			Data="{StaticResource UpArrowGeometry}"
-			Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+   <DataTemplate x:Key="IncreaseGlyphDisabledKey">
+      <Path	Width="7"
+            Height="4"
+            Data="{StaticResource UpArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
             SnapsToDevicePixels="True"
-             HorizontalAlignment="Center" VerticalAlignment="Center" Focusable="False" />
-    </DataTemplate>
-
-    <DataTemplate x:Key="DecreaseGlyphNormalKey">
-        <Path
-			Width="7"
-			Height="4"
-			Data="{StaticResource DownArrowGeometry}"
-			Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+
+   <DataTemplate x:Key="DecreaseGlyphNormalKey">
+      <Path Width="7"
+            Height="4"
+            Data="{StaticResource DownArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphNormalForegroundKey}}"
             SnapsToDevicePixels="True"
-             HorizontalAlignment="Center" VerticalAlignment="Center" Focusable="False" />
-    </DataTemplate>
-
-    <DataTemplate x:Key="DecreaseGlyphDisabledKey">
-        <Path
-			Width="7"
-			Height="4"
-			Data="{StaticResource DownArrowGeometry}"
-			Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
+
+   <DataTemplate x:Key="DecreaseGlyphDisabledKey">
+      <Path	Width="7"
+            Height="4"
+            Data="{StaticResource DownArrowGeometry}"
+            Fill="{DynamicResource {x:Static themes:ResourceKeys.GlyphDisabledForegroundKey}}"
             SnapsToDevicePixels="True"
-             HorizontalAlignment="Center" VerticalAlignment="Center" Focusable="False" />
-    </DataTemplate>
+            HorizontalAlignment="Center"
+            VerticalAlignment="Center"
+            Focusable="False" />
+   </DataTemplate>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
index 8da68dd8..c7e8e6b2 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TimePicker/Themes/Generic.xaml
@@ -1,137 +1,160 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:chrome="clr-namespace:Microsoft.Windows.Controls.Chromes"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <!-- =============================================================================== -->
-    <!-- ResourceDictionary for TimePicker and related controls                          -->
-    <!-- =============================================================================== -->
-
-    <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
-    <coreConverters:TimeFormatToDateTimeFormatConverter x:Key="TimeFormatToDateTimeFormatConverter" />
-
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
-    </DataTemplate>
-
-    <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
-        <GradientStop Color="#FFA3AEB9" Offset="0"/>
-        <GradientStop Color="#FF8399A9" Offset="0.375"/>
-        <GradientStop Color="#FF718597" Offset="0.375"/>
-        <GradientStop Color="#FF617584" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
-        <LinearGradientBrush.GradientStops>
-            <GradientStopCollection>
-                <GradientStop Offset="0" Color="#FFffffff"/>
-                <GradientStop Offset="1" Color="#FFE8EBED"/>
-            </GradientStopCollection>
-        </LinearGradientBrush.GradientStops>
-    </LinearGradientBrush>
-
-    <Style x:Key="TimePickerToggleButtonStyle" TargetType="ToggleButton">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Grid SnapsToDevicePixels="True">
-                        <chrome:ButtonChrome x:Name="ToggleButtonChrome"
-                                             CornerRadius="0,2.75,2.75,0"
-                                             RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
-                                             RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
-											 RenderMouseOver="{TemplateBinding IsMouseOver}"
-											 RenderPressed="{TemplateBinding IsPressed}" >
-
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*"/>
-                                    <ColumnDefinition Width="Auto"/>
-                                </Grid.ColumnDefinitions>
-
-                                <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                                <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
-                                    <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000"/>
-                                </Grid>
-                            </Grid>
-                        </chrome:ButtonChrome>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <SolidColorBrush x:Key="ListItemHover" Color="#FFE7F5FD"/>
-
-    <Style x:Key="TimeItemStyle" TargetType="ListBoxItem">
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ListBoxItem">
-                    <Border Name="Border" SnapsToDevicePixels="true">
-                        <ContentPresenter Margin="4" />
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{StaticResource ListItemHover}" />
-                        </Trigger>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
-                            <Setter Property="Foreground" Value="White" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <!-- =============================================================================== -->
-    <!-- TimePicker                                                                      -->
-    <!-- =============================================================================== -->
-
-    <Style TargetType="{x:Type local:TimePicker}">
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:TimePicker}">
-                    <Border>
-                        <Grid>
-                            <Grid>
-                                <Grid.ColumnDefinitions>
-                                    <ColumnDefinition Width="*" />
-                                    <ColumnDefinition Width="Auto" />
-                                </Grid.ColumnDefinitions>
-                                <local:DateTimeUpDown x:Name="PART_TimeUpDown" 
-                                                      BorderThickness="1,1,0,1"
-                                                      Background="{TemplateBinding Background}"
-                                                      Foreground="{TemplateBinding Foreground}"
-                                                      ContextMenu="{TemplateBinding ContextMenu}"
-                                                      AllowSpin="{TemplateBinding AllowSpin}"
-                                                      Format="{TemplateBinding Format, Converter={StaticResource TimeFormatToDateTimeFormatConverter}}"
-                                                      FormatString="{TemplateBinding FormatString}"
-                                                      ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
-                                                      Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
-                                                      Watermark="{TemplateBinding Watermark}"
-                                                      WatermarkTemplate="{TemplateBinding WatermarkTemplate}"/>
-                                <ToggleButton x:Name="_timePickerToggleButton" Grid.Column="1"
-                                              IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
-                                              Style="{StaticResource TimePickerToggleButtonStyle}"
-                                              IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}"/>
-                            </Grid>
-                            <Popup IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}" StaysOpen="False">
-                                <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}" >
-                                    <Grid>
-                                        <ListBox x:Name="PART_TimeListItems" BorderThickness="0" Width="150" Height="130"
-                                                 DisplayMemberPath="Display"
-                                                 ItemContainerStyle="{StaticResource TimeItemStyle}"/>
-                                    </Grid>
-                                </Border>
-                            </Popup>
+   <!-- =============================================================================== -->
+   <!-- ResourceDictionary for TimePicker and related controls                          -->
+   <!-- =============================================================================== -->
+
+   <coreConverters:InverseBoolConverter x:Key="InverseBoolConverter" />
+   <coreConverters:TimeFormatToDateTimeFormatConverter x:Key="TimeFormatToDateTimeFormatConverter" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <LinearGradientBrush x:Key="PopupDarkBorderBrush" EndPoint="0.5,1" StartPoint="0.5,0">
+      <GradientStop Color="#FFA3AEB9" Offset="0" />
+      <GradientStop Color="#FF8399A9" Offset="0.375" />
+      <GradientStop Color="#FF718597" Offset="0.375" />
+      <GradientStop Color="#FF617584" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="PopupBackgroundBrush" StartPoint="0,0" EndPoint="0,1">
+      <LinearGradientBrush.GradientStops>
+         <GradientStopCollection>
+            <GradientStop Offset="0" Color="#FFffffff" />
+            <GradientStop Offset="1" Color="#FFE8EBED" />
+         </GradientStopCollection>
+      </LinearGradientBrush.GradientStops>
+   </LinearGradientBrush>
+
+   <Style x:Key="TimePickerToggleButtonStyle" TargetType="ToggleButton">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ToggleButton">
+               <Grid SnapsToDevicePixels="True">
+                  <chrome:ButtonChrome x:Name="ToggleButtonChrome"
+                                       CornerRadius="0,2.75,2.75,0"
+                                       RenderChecked="{Binding IsOpen, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
+                                       RenderEnabled="{Binding IsEnabled, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:TimePicker}}"
+                                       RenderMouseOver="{TemplateBinding IsMouseOver}"
+                                       RenderPressed="{TemplateBinding IsPressed}">
+
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+
+                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+
+                        <Grid x:Name="arrowGlyph" IsHitTestVisible="False" Grid.Column="1" Margin="5">
+                           <Path Width="7" Height="4" Data="M 0,1 C0,1 0,0 0,0 0,0 3,0 3,0 3,0 3,1 3,1 3,1 4,1 4,1 4,1 4,0 4,0 4,0 7,0 7,0 7,0 7,1 7,1 7,1 6,1 6,1 6,1 6,2 6,2 6,2 5,2 5,2 5,2 5,3 5,3 5,3 4,3 4,3 4,3 4,4 4,4 4,4 3,4 3,4 3,4 3,3 3,3 3,3 2,3 2,3 2,3 2,2 2,2 2,2 1,2 1,2 1,2 1,1 1,1 1,1 0,1 0,1 z" Fill="#FF000000" />
                         </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+                     </Grid>
+                  </chrome:ButtonChrome>
+               </Grid>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <SolidColorBrush x:Key="ListItemHover" Color="#FFE7F5FD" />
+
+   <Style x:Key="TimeItemStyle" TargetType="ListBoxItem">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="ListBoxItem">
+               <Border Name="Border" SnapsToDevicePixels="true">
+                  <ContentPresenter Margin="4" />
+               </Border>
+               <ControlTemplate.Triggers>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="Border" Property="Background" Value="{StaticResource ListItemHover}" />
+                  </Trigger>
+                  <Trigger Property="IsSelected" Value="True">
+                     <Setter TargetName="Border" Property="Background" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}" />
+                     <Setter Property="Foreground" Value="White" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <!-- =============================================================================== -->
+   <!-- TimePicker                                                                      -->
+   <!-- =============================================================================== -->
+
+   <Style TargetType="{x:Type local:TimePicker}">
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:TimePicker}">
+               <Border>
+                  <Grid>
+                     <Grid>
+                        <Grid.ColumnDefinitions>
+                           <ColumnDefinition Width="*" />
+                           <ColumnDefinition Width="Auto" />
+                        </Grid.ColumnDefinitions>
+                        <local:DateTimeUpDown x:Name="PART_TimeUpDown" 
+                                              BorderThickness="1,1,0,1"
+                                              Background="{TemplateBinding Background}"
+                                              Foreground="{TemplateBinding Foreground}"
+                                              ContextMenu="{TemplateBinding ContextMenu}"
+                                              AllowSpin="{TemplateBinding AllowSpin}"
+                                              Format="{TemplateBinding Format, Converter={StaticResource TimeFormatToDateTimeFormatConverter}}"
+                                              FormatString="{TemplateBinding FormatString}"
+                                              ShowButtonSpinner="{TemplateBinding ShowButtonSpinner}"
+                                              Value="{Binding Value, RelativeSource={RelativeSource TemplatedParent}}"
+                                              Watermark="{TemplateBinding Watermark}"
+                                              WatermarkTemplate="{TemplateBinding WatermarkTemplate}" />
+                        <ToggleButton x:Name="_timePickerToggleButton"
+                                      Grid.Column="1"
+                                      IsChecked="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}}"
+                                      Style="{StaticResource TimePickerToggleButtonStyle}"
+                                      IsHitTestVisible="{Binding IsOpen, RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource InverseBoolConverter}}" />
+                     </Grid>
+                     <Popup IsOpen="{Binding IsChecked, ElementName=_timePickerToggleButton}"
+                            StaysOpen="False">
+                        <Border BorderThickness="1" Background="{StaticResource PopupBackgroundBrush}" BorderBrush="{StaticResource PopupDarkBorderBrush}">
+                           <Grid>
+                              <ListBox x:Name="PART_TimeListItems"
+                                       BorderThickness="0"
+                                       Width="150"
+                                       Height="130"
+                                       DisplayMemberPath="Display"
+                                       ItemContainerStyle="{StaticResource TimeItemStyle}" />
+                           </Grid>
+                        </Border>
+                     </Popup>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml
index ee422d5b..aee352a4 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/TokenizedTextBox/Themes/Generic.xaml
@@ -1,59 +1,78 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Microsoft.Windows.Controls" >
-
-    <Style TargetType="{x:Type local:TokenItem}">
-        <Setter Property="Background" Value="#F3F7FD" />
-        <Setter Property="BorderBrush" Value="#BBD8FB" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Cursor" Value="Arrow" />
-        <Setter Property="Padding" Value="5,1,5,1" />
-        <Setter Property="Margin" Value="1,0" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:TokenItem}">
-                    <Border Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            Padding="{TemplateBinding Padding}"
-                            Margin="{TemplateBinding Margin}">
-                        <StackPanel Orientation="Horizontal" Margin="1">
-                            <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" />
-                            <Button Margin="3,0,0,0" Cursor="Hand" Command="local:TokenizedTextBoxCommands.Delete" CommandParameter="{TemplateBinding TokenKey}"  >
-                                <Button.Template>
-                                    <ControlTemplate TargetType="Button">
-                                        <ContentPresenter />
-                                    </ControlTemplate>
-                                </Button.Template>
-                                <Image Source="/WPFToolkit.Extended;component/TokenizedTextBox/Images/delete8.png" Width="8" Height="8" />
-                            </Button>
-                        </StackPanel>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <Style TargetType="{x:Type local:TokenizedTextBox}" >
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:TokenizedTextBox}">
-                    <Border x:Name="Bd" Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid>
-                            <RichTextBox x:Name="PART_ContentHost" AcceptsReturn="False" IsDocumentEnabled="True" Padding="-3,0,0,0"  />
-                            <!--<Popup>
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls">
+
+   <Style TargetType="{x:Type local:TokenItem}">
+      <Setter Property="Background" Value="#F3F7FD" />
+      <Setter Property="BorderBrush" Value="#BBD8FB" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Cursor" Value="Arrow" />
+      <Setter Property="Padding" Value="5,1,5,1" />
+      <Setter Property="Margin" Value="1,0" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:TokenItem}">
+               <Border Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}"
+                       Padding="{TemplateBinding Padding}"
+                       Margin="{TemplateBinding Margin}">
+                  <StackPanel Orientation="Horizontal" Margin="1">
+                     <ContentPresenter ContentTemplate="{TemplateBinding ContentTemplate}" />
+                     <Button Margin="3,0,0,0" Cursor="Hand" Command="local:TokenizedTextBoxCommands.Delete" CommandParameter="{TemplateBinding TokenKey}">
+                        <Button.Template>
+                           <ControlTemplate TargetType="Button">
+                              <ContentPresenter />
+                           </ControlTemplate>
+                        </Button.Template>
+                        <Image Source="/WPFToolkit.Extended;component/TokenizedTextBox/Images/delete8.png" Width="8" Height="8" />
+                     </Button>
+                  </StackPanel>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
+
+   <Style TargetType="{x:Type local:TokenizedTextBox}">
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:TokenizedTextBox}">
+               <Border x:Name="Bd"
+                       Background="{TemplateBinding Background}"
+                       BorderBrush="{TemplateBinding BorderBrush}"
+                       BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid>
+                     <RichTextBox x:Name="PART_ContentHost" AcceptsReturn="False" IsDocumentEnabled="True" Padding="-3,0,0,0" />
+                     <!--<Popup>
                                 <Grid Background="White">
                                     <ItemsPresenter />
                                 </Grid>
                             </Popup>-->
-                        </Grid>
-                    </Border>
+                  </Grid>
+               </Border>
 
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
index 83ce7afd..8ffc76ac 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/WatermarkTextBox/Themes/Generic.xaml
@@ -1,96 +1,104 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:local="clr-namespace:Microsoft.Windows.Controls">
-
-    <LinearGradientBrush x:Key="TextBoxBorder" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
-        <GradientStop Color="#ABADB3" Offset="0.05"/>
-        <GradientStop Color="#E2E3EA" Offset="0.07"/>
-        <GradientStop Color="#E3E9EF" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="TextBox_MouseOver" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#5794BF" Offset="0.05"/>
-        <GradientStop Color="#B7D5EA" Offset="0.07"/>
-        <GradientStop Color="#C7E2F1" Offset="1"/>
-    </LinearGradientBrush>
-
-    <LinearGradientBrush x:Key="TextBox_Focused" EndPoint="0,1" StartPoint="0,0">
-        <GradientStop Color="#3D7BAD" Offset="0.05"/>
-        <GradientStop Color="#A4C9E3" Offset="0.07"/>
-        <GradientStop Color="#B7D9ED" Offset="1"/>
-    </LinearGradientBrush>
-
-    <SolidColorBrush x:Key="TextBox_DisabledBorder" Color="#ADB2B5" />
-    <SolidColorBrush x:Key="TextBox_DisabledBackground" Color="#F4F4F4" />
+<!--*********************************************************************
 
-    <DataTemplate x:Key="DefaultWatermarkTemplate">
-        <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
-    </DataTemplate>
+   Extended WPF Toolkit
 
-    <Style TargetType="{x:Type local:WatermarkTextBox}">
-        <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}"/>
-        <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}"/>
-        <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorder}"/>
-        <Setter Property="BorderThickness" Value="1"/>
-        <Setter Property="Padding" Value="3" />
-        <Setter Property="AllowDrop" Value="true"/>
-        <Setter Property="FocusVisualStyle" Value="{x:Null}"/>
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False"/>
-        <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
-                    <Grid>
+   Copyright (C) 2010-2012 Xceed Software Inc.
 
-                        <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="1" Background="{TemplateBinding Background}">
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
 
-                        </Border>
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
 
-                        <Border x:Name="MouseOverVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_MouseOver}" CornerRadius="1" >
+   Visit http://xceed.com and follow @datagrid on Twitter.
 
-                        </Border>
-
-                        <Border x:Name="FocusVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_Focused}" CornerRadius="1" >
-
-                        </Border>
-
-                        <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-
-                        <ContentPresenter x:Name="PART_WatermarkHost" 
-                                          Content="{TemplateBinding Watermark}"
-                                          ContentTemplate="{TemplateBinding WatermarkTemplate}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"                                       
-                                          IsHitTestVisible="False"
-                                          Margin="{TemplateBinding Padding}"
-                                          Visibility="Collapsed"/>
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:Microsoft.Windows.Controls">
 
-                    </Grid>
-                    <ControlTemplate.Triggers>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="IsFocused" Value="False"></Condition>
-                                <Condition Property="Text" Value=""></Condition>
-                            </MultiTrigger.Conditions>
-                            <MultiTrigger.Setters>
-                                <Setter Property="Visibility" TargetName="PART_WatermarkHost" Value="Visible"></Setter>
-                            </MultiTrigger.Setters>
-                        </MultiTrigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="MouseOverVisual" Property="Opacity"  Value="1" />
-                        </Trigger>
-                        <Trigger Property="IsFocused" Value="True">
-                            <Setter TargetName="FocusVisual" Property="Opacity"  Value="1" />
-                        </Trigger>
-                        <Trigger Property="IsEnabled" Value="false">
-                            <Setter TargetName="Border"  Property="BorderBrush" Value="{StaticResource TextBox_DisabledBorder}"/>
-                            <Setter TargetName="Border"  Property="Background" Value="{StaticResource TextBox_DisabledBackground}"/>
-                            <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
+   <LinearGradientBrush x:Key="TextBoxBorder" EndPoint="0,20" MappingMode="Absolute" StartPoint="0,0">
+      <GradientStop Color="#ABADB3" Offset="0.05" />
+      <GradientStop Color="#E2E3EA" Offset="0.07" />
+      <GradientStop Color="#E3E9EF" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="TextBox_MouseOver" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#5794BF" Offset="0.05" />
+      <GradientStop Color="#B7D5EA" Offset="0.07" />
+      <GradientStop Color="#C7E2F1" Offset="1" />
+   </LinearGradientBrush>
+
+   <LinearGradientBrush x:Key="TextBox_Focused" EndPoint="0,1" StartPoint="0,0">
+      <GradientStop Color="#3D7BAD" Offset="0.05" />
+      <GradientStop Color="#A4C9E3" Offset="0.07" />
+      <GradientStop Color="#B7D9ED" Offset="1" />
+   </LinearGradientBrush>
+
+   <SolidColorBrush x:Key="TextBox_DisabledBorder" Color="#ADB2B5" />
+   <SolidColorBrush x:Key="TextBox_DisabledBackground" Color="#F4F4F4" />
+
+   <DataTemplate x:Key="DefaultWatermarkTemplate">
+      <ContentControl Content="{Binding}" Foreground="Gray" Focusable="False" />
+   </DataTemplate>
+
+   <Style TargetType="{x:Type local:WatermarkTextBox}">
+      <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.ControlTextBrushKey}}" />
+      <Setter Property="Background" Value="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" />
+      <Setter Property="BorderBrush" Value="{StaticResource TextBoxBorder}" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="Padding" Value="3" />
+      <Setter Property="AllowDrop" Value="true" />
+      <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+      <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
+      <Setter Property="WatermarkTemplate" Value="{StaticResource DefaultWatermarkTemplate}" />
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:WatermarkTextBox}">
+               <Grid>
+
+                  <Border x:Name="Border" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" CornerRadius="1" Background="{TemplateBinding Background}" />
+                  <Border x:Name="MouseOverVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_MouseOver}" CornerRadius="1" />
+                  <Border x:Name="FocusVisual" Opacity="0" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{StaticResource TextBox_Focused}" CornerRadius="1" />
+                  <ScrollViewer x:Name="PART_ContentHost" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                  <ContentPresenter x:Name="PART_WatermarkHost"
+                                    Content="{TemplateBinding Watermark}"
+                                    ContentTemplate="{TemplateBinding WatermarkTemplate}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                    HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                    IsHitTestVisible="False"
+                                    Margin="{TemplateBinding Padding}"
+                                    Visibility="Collapsed" />
+
+               </Grid>
+               <ControlTemplate.Triggers>
+                  <MultiTrigger>
+                     <MultiTrigger.Conditions>
+                        <Condition Property="IsFocused" Value="False" />
+                        <Condition Property="Text" Value="" />
+                     </MultiTrigger.Conditions>
+                     <MultiTrigger.Setters>
+                        <Setter Property="Visibility" TargetName="PART_WatermarkHost" Value="Visible" />
+                     </MultiTrigger.Setters>
+                  </MultiTrigger>
+                  <Trigger Property="IsMouseOver" Value="True">
+                     <Setter TargetName="MouseOverVisual" Property="Opacity" Value="1" />
+                  </Trigger>
+                  <Trigger Property="IsFocused" Value="True">
+                     <Setter TargetName="FocusVisual" Property="Opacity" Value="1" />
+                  </Trigger>
+                  <Trigger Property="IsEnabled" Value="false">
+                     <Setter TargetName="Border"  Property="BorderBrush" Value="{StaticResource TextBox_DisabledBorder}" />
+                     <Setter TargetName="Border"  Property="Background" Value="{StaticResource TextBox_DisabledBackground}" />
+                     <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}" />
+                  </Trigger>
+               </ControlTemplate.Triggers>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml
index b1f474f1..f8ac834b 100644
--- a/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml
+++ b/ExtendedWPFToolkitSolution_35/Src/WPFToolkit.Extended/Wizard/Themes/Generic.xaml
@@ -1,182 +1,208 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<!--*********************************************************************
+
+   Extended WPF Toolkit
+
+   Copyright (C) 2010-2012 Xceed Software Inc.
+
+   This program is provided to you under the terms of the Microsoft Reciprocal
+   License (Ms-RL) as published at http://wpftoolkit.codeplex.com/license 
+
+   This program can be provided to you by Xceed Software Inc. under a
+   proprietary commercial license agreement for use in non-Open Source
+   projects. The commercial version of Extended WPF Toolkit also includes
+   priority technical support, commercial updates, and many additional 
+   useful WPF controls if you license Xceed Business Suite for WPF.
+
+   Visit http://xceed.com and follow @datagrid on Twitter.
+
+  ********************************************************************-->
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:local="clr-namespace:Microsoft.Windows.Controls"
                     xmlns:coreConverters="clr-namespace:Microsoft.Windows.Controls.Core.Converters">
 
-    <coreConverters:WizardPageButtonVisibilityConverter x:Key="WizardPageButtonVisibilityConverter" />
-
-    <Style TargetType="{x:Type local:Wizard}">
-        <Setter Property="Background" Value="#F0F0F0" />
-        <Setter Property="BorderBrush" Value="#A0A0A0" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="ItemsPanel">
-            <Setter.Value>
-                <ItemsPanelTemplate>
-                    <Grid />
-                </ItemsPanelTemplate>
-            </Setter.Value>
-        </Setter>
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type local:Wizard}">
-                    <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
-                        <Grid Background="{TemplateBinding Background}">
-                            <Grid.RowDefinitions>
-                                <RowDefinition Height="*" />
-                                <RowDefinition Height="Auto" />
-                            </Grid.RowDefinitions>
-
-                            <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
-
-                            <Border Grid.Row="1" Background="#F0F0F0" BorderBrush="#A0A0A0" BorderThickness="0,1,0,0" Padding="7"  >
-                                <StackPanel Background="{TemplateBinding Background}">
-                                    <Grid Margin="{TemplateBinding Padding}">
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition Width="Auto" />
-                                            <ColumnDefinition Width="*" />
-                                        </Grid.ColumnDefinitions>
-                                        <Button Name="PART_HelpButton" Grid.Column="0" MinWidth="75" 
-                                            Command="local:WizardCommands.Help" 
-                                            Content="{TemplateBinding HelpButtonContent}">
-                                            <Button.Visibility>
-                                                <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}" >
-                                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="HelpButtonVisibility" />
-                                                    <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.HelpButtonVisibility" />
-                                                </MultiBinding>
-                                            </Button.Visibility>
-                                        </Button>
-                                        <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
-                                            <Button Name="PART_CancelButton" Margin="0,0,7,0" MinWidth="75" 
-                                                Command="local:WizardCommands.Cancel" 
-                                                Content="{TemplateBinding CancelButtonContent}" >
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}" >
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CancelButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.CancelButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                            <Button Name="PART_BackButton" MinWidth="75" 
-                                                Command="local:WizardCommands.PreviousPage" 
-                                                Content="{TemplateBinding BackButtonContent}" >
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}" >
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BackButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.BackButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                            <Button Name="PART_NextButton" MinWidth="75" 
-                                                Command="local:WizardCommands.NextPage"
-                                                Content="{TemplateBinding NextButtonContent}" >
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}" >
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NextButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.NextButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                            <Button Name="PART_FinishButton" Margin="7,0,0,0" MinWidth="75" 
-                                                Command="local:WizardCommands.Finish" 
-                                                Content="{TemplateBinding FinishButtonContent}" >
-                                                <Button.Visibility>
-                                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}" >
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FinishButtonVisibility" />
-                                                        <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.FinishButtonVisibility" />
-                                                    </MultiBinding>
-                                                </Button.Visibility>
-                                            </Button>
-                                        </StackPanel>
-                                    </Grid>
-                                </StackPanel>
-                            </Border>
-                        </Grid>
-                    </Border>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-    <ControlTemplate x:Key="BlankWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-        <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-            <Grid Background="{TemplateBinding Background}">
-                <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-            </Grid>
-        </Border>
-    </ControlTemplate>
+   <coreConverters:WizardPageButtonVisibilityConverter x:Key="WizardPageButtonVisibilityConverter" />
 
-    <ControlTemplate x:Key="ExteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-        <Grid Background="{TemplateBinding Background}">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="Auto" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
-            <Border SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-                <Grid Grid.Column="0" Background="{TemplateBinding ExteriorPanelBackground}" MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}" >
-                    <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
-                </Grid>
-            </Border>
-            <Grid Column="1" Margin="14">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition Height="*" />
-                </Grid.RowDefinitions>
-                <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,14" FontSize="16" FontWeight="Bold" Text="{TemplateBinding Title}" />
-                <TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,0,0,14" Text="{TemplateBinding Description}" />
-                <ContentPresenter Grid.Row="2" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-            </Grid>
-        </Grid>
-    </ControlTemplate>
+   <Style TargetType="{x:Type local:Wizard}">
+      <Setter Property="Background" Value="#F0F0F0" />
+      <Setter Property="BorderBrush" Value="#A0A0A0" />
+      <Setter Property="BorderThickness" Value="1" />
+      <Setter Property="ItemsPanel">
+         <Setter.Value>
+            <ItemsPanelTemplate>
+               <Grid />
+            </ItemsPanelTemplate>
+         </Setter.Value>
+      </Setter>
+      <Setter Property="Template">
+         <Setter.Value>
+            <ControlTemplate TargetType="{x:Type local:Wizard}">
+               <Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+                  <Grid Background="{TemplateBinding Background}">
+                     <Grid.RowDefinitions>
+                        <RowDefinition Height="*" />
+                        <RowDefinition Height="Auto" />
+                     </Grid.RowDefinitions>
+
+                     <ContentPresenter Content="{Binding CurrentPage, RelativeSource={RelativeSource TemplatedParent}}" />
+
+                     <Border Grid.Row="1" Background="#F0F0F0" BorderBrush="#A0A0A0" BorderThickness="0,1,0,0" Padding="7">
+                        <StackPanel Background="{TemplateBinding Background}">
+                           <Grid Margin="{TemplateBinding Padding}">
+                              <Grid.ColumnDefinitions>
+                                 <ColumnDefinition Width="Auto" />
+                                 <ColumnDefinition Width="*" />
+                              </Grid.ColumnDefinitions>
+                              <Button Name="PART_HelpButton"
+                                      Grid.Column="0"
+                                      MinWidth="75" 
+                                      Command="local:WizardCommands.Help" 
+                                      Content="{TemplateBinding HelpButtonContent}">
+                                 <Button.Visibility>
+                                    <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                       <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="HelpButtonVisibility" />
+                                       <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.HelpButtonVisibility" />
+                                    </MultiBinding>
+                                 </Button.Visibility>
+                              </Button>
+                              <StackPanel Grid.Column="1" Orientation="Horizontal" HorizontalAlignment="Right">
+                                 <Button Name="PART_CancelButton"
+                                         Margin="0,0,7,0"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.Cancel" 
+                                         Content="{TemplateBinding CancelButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CancelButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.CancelButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                                 <Button Name="PART_BackButton"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.PreviousPage" 
+                                         Content="{TemplateBinding BackButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="BackButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.BackButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                                 <Button Name="PART_NextButton"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.NextPage"
+                                         Content="{TemplateBinding NextButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="NextButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.NextButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                                 <Button Name="PART_FinishButton"
+                                         Margin="7,0,0,0"
+                                         MinWidth="75" 
+                                         Command="local:WizardCommands.Finish" 
+                                         Content="{TemplateBinding FinishButtonContent}">
+                                    <Button.Visibility>
+                                       <MultiBinding Converter="{StaticResource WizardPageButtonVisibilityConverter}">
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="FinishButtonVisibility" />
+                                          <Binding RelativeSource="{RelativeSource TemplatedParent}" Path="CurrentPage.FinishButtonVisibility" />
+                                       </MultiBinding>
+                                    </Button.Visibility>
+                                 </Button>
+                              </StackPanel>
+                           </Grid>
+                        </StackPanel>
+                     </Border>
+                  </Grid>
+               </Border>
+            </ControlTemplate>
+         </Setter.Value>
+      </Setter>
+   </Style>
 
-    <ControlTemplate x:Key="InteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
-        <Grid>
+   <ControlTemplate x:Key="BlankWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+      <Border SnapsToDevicePixels="true" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+         <Grid Background="{TemplateBinding Background}">
+            <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+         </Grid>
+      </Border>
+   </ControlTemplate>
+
+   <ControlTemplate x:Key="ExteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+      <Grid Background="{TemplateBinding Background}">
+         <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+         </Grid.ColumnDefinitions>
+         <Border SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <Grid Grid.Column="0" Background="{TemplateBinding ExteriorPanelBackground}" MinWidth="{Binding ExteriorPanelMinWidth, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:Wizard}}">
+               <ContentControl Content="{TemplateBinding ExteriorPanelContent}" />
+            </Grid>
+         </Border>
+         <Grid Column="1" Margin="14">
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto" />
-                <RowDefinition Height="*" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="Auto" />
+               <RowDefinition Height="*" />
             </Grid.RowDefinitions>
+            <TextBlock Grid.Row="0" TextWrapping="Wrap" Margin="0,0,0,14" FontSize="16" FontWeight="Bold" Text="{TemplateBinding Title}" />
+            <TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,0,0,14" Text="{TemplateBinding Description}" />
+            <ContentPresenter Grid.Row="2" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
+         </Grid>
+      </Grid>
+   </ControlTemplate>
 
-            <Grid Background="{TemplateBinding HeaderBackground}" MinHeight="56" >
-                <Grid.ColumnDefinitions>
-                    <ColumnDefinition Width="*" />
-                    <ColumnDefinition Width="Auto" />
-                </Grid.ColumnDefinitions>
-                <StackPanel>
-                    <TextBlock Margin="16,9,0,1" TextWrapping="Wrap" FontWeight="Bold" Text="{TemplateBinding Title}" />
-                    <TextBlock Margin="32,0,0,3" TextWrapping="Wrap" Text="{TemplateBinding Description}" />
-                </StackPanel>
-                <Image Grid.Column="1" Margin="4" Source="{TemplateBinding HeaderImage}" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" />
+   <ControlTemplate x:Key="InteriorWizardPageTemplate" TargetType="{x:Type local:WizardPage}">
+      <Grid>
+         <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+         </Grid.RowDefinitions>
+
+         <Grid Background="{TemplateBinding HeaderBackground}" MinHeight="56">
+            <Grid.ColumnDefinitions>
+               <ColumnDefinition Width="*" />
+               <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <StackPanel>
+               <TextBlock Margin="16,9,0,1" TextWrapping="Wrap" FontWeight="Bold" Text="{TemplateBinding Title}" />
+               <TextBlock Margin="32,0,0,3" TextWrapping="Wrap" Text="{TemplateBinding Description}" />
+            </StackPanel>
+            <Image Grid.Column="1" Margin="4" Source="{TemplateBinding HeaderImage}" Stretch="None" HorizontalAlignment="Center" VerticalAlignment="Center" />
+         </Grid>
+
+         <Border Grid.Row="1" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
+            <Grid Background="{TemplateBinding Background}">
+               <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
             </Grid>
+         </Border>
+      </Grid>
+   </ControlTemplate>
 
-            <Border Grid.Row="1" SnapsToDevicePixels="true" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}">
-                <Grid Background="{TemplateBinding Background}">
-                    <ContentPresenter Margin="14" Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" />
-                </Grid>
-            </Border>
-        </Grid>
-    </ControlTemplate>
-
-    <Style TargetType="{x:Type local:WizardPage}">
-        <Style.Triggers>
-            <Trigger Property="PageType" Value="Blank">
-                <Setter Property="Background" Value="#FFF0F0F0" />
-                <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="Template" Value="{StaticResource BlankWizardPageTemplate}" />
-            </Trigger>
-            <Trigger Property="PageType" Value="Exterior">
-                <Setter Property="Background" Value="#FFFFFF" />
-                <Setter Property="BorderThickness" Value="0" />
-                <Setter Property="ExteriorPanelBackground" Value="#E3EFFF" />
-                <Setter Property="Template" Value="{StaticResource ExteriorWizardPageTemplate}" />
-            </Trigger>
-            <Trigger Property="PageType" Value="Interior">
-                <Setter Property="Background" Value="#FFF0F0F0" />
-                <Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
-                <Setter Property="BorderThickness" Value="0,1,0,0" />
-                <Setter Property="HeaderBackground" Value="#FFFFFF" />
-                <Setter Property="Template" Value="{StaticResource InteriorWizardPageTemplate}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
+   <Style TargetType="{x:Type local:WizardPage}">
+      <Style.Triggers>
+         <Trigger Property="PageType" Value="Blank">
+            <Setter Property="Background" Value="#FFF0F0F0" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="Template" Value="{StaticResource BlankWizardPageTemplate}" />
+         </Trigger>
+         <Trigger Property="PageType" Value="Exterior">
+            <Setter Property="Background" Value="#FFFFFF" />
+            <Setter Property="BorderThickness" Value="0" />
+            <Setter Property="ExteriorPanelBackground" Value="#E3EFFF" />
+            <Setter Property="Template" Value="{StaticResource ExteriorWizardPageTemplate}" />
+         </Trigger>
+         <Trigger Property="PageType" Value="Interior">
+            <Setter Property="Background" Value="#FFF0F0F0" />
+            <Setter Property="BorderBrush" Value="{x:Static SystemColors.ActiveBorderBrush}" />
+            <Setter Property="BorderThickness" Value="0,1,0,0" />
+            <Setter Property="HeaderBackground" Value="#FFFFFF" />
+            <Setter Property="Template" Value="{StaticResource InteriorWizardPageTemplate}" />
+         </Trigger>
+      </Style.Triggers>
+   </Style>
 
 </ResourceDictionary>
\ No newline at end of file