diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/AssemblyVersionInfo.cs
similarity index 64%
rename from ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
rename to ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/AssemblyVersionInfo.cs
index fa0d2b02..7d793848 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Properties/AssemblyInfo.cs
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/AssemblyVersionInfo.cs
@@ -1,59 +1,57 @@
-using System.Reflection;
-using System.Resources;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-using System.Windows;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Xceed Toolkit for WPF LiveExplorer" )]
-[assembly: AssemblyDescription( "" )]
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Xceed Toolkit for WPF" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2007-2017" )]
-[assembly: AssemblyCulture( "" )]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible( false )]
-
-//In order to begin building localizable applications, set 
-//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
-//inside a <PropertyGroup>.  For example, if you are using US english
-//in your source files, set the <UICulture> to en-US.  Then uncomment
-//the NeutralResourceLanguage attribute below.  Update the "en-US" in
-//the line below to match the UICulture setting in the project file.
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
-[assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
-  //(used if a resource is not found in the page, 
-  // or application resource dictionaries)
-    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
-  //(used if a resource is not found in the page, 
-  // app, or any theme specific resource dictionaries)
-)]
-
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion( "3.4.*" )]
-[assembly: AssemblyFileVersion( "3.4.0.0" )]
-
-#pragma warning disable 1699
-[assembly: AssemblyDelaySign( false )]
-[assembly: AssemblyKeyFile( @"..\..\..\sn.snk" )]
-[assembly: AssemblyKeyName( "" )]
-#pragma warning restore 1699
+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("Xceed Toolkit for WPF LiveExplorer")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyCompany("Xceed Software Inc.")]
+[assembly: AssemblyProduct("Xceed Toolkit for WPF")]
+[assembly: AssemblyCopyright("Copyright (C) Xceed Software Inc. 2007-2017")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set 
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page, 
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page, 
+                                              // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("3.4.0")]
+[assembly: AssemblyFileVersion("3.4.0.0")]
+
+#pragma warning disable 1699
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile(@"..\..\..\sn.snk")]
+[assembly: AssemblyKeyName("")]
+#pragma warning restore 1699
diff --git a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj
index 75a2ecac..1d1b71d9 100644
--- a/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj
+++ b/ExtendedWPFToolkitSolution/Src/Xceed.Wpf.Toolkit.LiveExplorer/Xceed.Wpf.Toolkit.LiveExplorer.csproj
@@ -1,20 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <TargetFramework>net8.0-windows</TargetFramework>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xceed.Wpf.Toolkit.LiveExplorer</RootNamespace>
-    <AssemblyName>Xceed.Wpf.Toolkit.LiveExplorer</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <WarningLevel>4</WarningLevel>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -33,25 +21,9 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWPF>true</UseWPF>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
   </PropertyGroup>
   <PropertyGroup>
     <GenerateManifests>true</GenerateManifests>
@@ -63,827 +35,25 @@
     <ApplicationIcon>App.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.ComponentModel.DataAnnotations" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Data.Services.Client" />
-    <Reference Include="System.Runtime.Serialization" />
-    <Reference Include="System.ServiceModel" />
-    <Reference Include="System.Xml" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Xaml">
-      <RequiredTargetFramework>4.0</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="WindowsBase" />
-    <Reference Include="PresentationCore" />
-    <Reference Include="PresentationFramework" />
-    <Reference Include="Xceed.Wpf.Samples.SampleData">
-      <HintPath>..\..\Libs\Xceed.Wpf.Samples.SampleData.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.Aero\Xceed.Wpf.AvalonDock.Themes.Aero.csproj">
-      <Project>{BA72CCE0-A9FB-4995-B496-7FEC5C87B85B}</Project>
-      <Name>Xceed.Wpf.AvalonDock.Themes.Aero</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj">
-      <Project>{89286EB4-B4A1-418C-839A-067B00F442D8}</Project>
-      <Name>Xceed.Wpf.AvalonDock.Themes.Metro</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.VS2010\Xceed.Wpf.AvalonDock.Themes.VS2010.csproj">
-      <Project>{B3FC3E21-5F2D-4581-AEA2-59F671CFFC21}</Project>
-      <Name>Xceed.Wpf.AvalonDock.Themes.VS2010</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj">
-      <Project>{DB81988F-E0F2-45A0-A1FD-8C37F3D35244}</Project>
-      <Name>Xceed.Wpf.AvalonDock</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj">
-      <Project>{63648392-6CE9-4A60-96D4-F9FD718D29B0}</Project>
-      <Name>Xceed.Wpf.DataGrid</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj">
-      <Project>{72E591D6-8F83-4D8C-8F67-9C325E623234}</Project>
-      <Name>Xceed.Wpf.Toolkit</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Compile Include="CodeBox.cs" />
-    <Compile Include="Core\Converters\ZeroToBoolConverter.cs" />
-    <Compile Include="Core\CSharpFormatter.cs" />
-    <Compile Include="Core\XamlFormatter.cs" />
-    <Compile Include="HomeView.xaml.cs">
-      <DependentUpon>HomeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\AvalonDock\Views\AvalonDockView.xaml.cs">
-      <DependentUpon>AvalonDockView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\BusyIndicator\Converters\IntegerToTimespanConverter.cs" />
-    <Compile Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml.cs">
-      <DependentUpon>BusyIndicatorCustomContentTemplateView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml.cs">
-      <DependentUpon>BusyIndicatorCustomContentView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\BusyIndicator\Views\BusyIndicatorView.xaml.cs">
-      <DependentUpon>BusyIndicatorView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Button\Views\IconButtonView.xaml.cs">
-      <DependentUpon>IconButtonView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Button\Views\ButtonSpinnerView.xaml.cs">
-      <DependentUpon>ButtonSpinnerView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Button\Views\DropDownSplitButtonView.xaml.cs">
-      <DependentUpon>DropDownSplitButtonView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Calculator\Views\CalculatorView.xaml.cs">
-      <DependentUpon>CalculatorView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Converters\GraduationModeToComboBoxConverter.cs" />
-    <Compile Include="Samples\Chart\Views\ChartAxisView.xaml.cs">
-      <DependentUpon>ChartAxisView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartLegendView.xaml.cs">
-      <DependentUpon>ChartLegendView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartSeriesBasicTypesView.xaml.cs">
-      <DependentUpon>ChartSeriesBasicTypesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml.cs">
-      <DependentUpon>ChartSeriesDataPointsBindingView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartStylingAxesGridView.xaml.cs">
-      <DependentUpon>ChartStylingAxesGridView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartStylingColumnSeriesView.xaml.cs">
-      <DependentUpon>ChartStylingColumnSeriesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartStylingLineSeriesView.xaml.cs">
-      <DependentUpon>ChartStylingLineSeriesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Chart\Views\ChartStylingPieSeriesView.xaml.cs">
-      <DependentUpon>ChartStylingPieSeriesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\CheckLists\Views\CheckListsView.xaml.cs">
-      <DependentUpon>CheckListsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Color\Views\ColorView.xaml.cs">
-      <DependentUpon>ColorView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\DataGrid\Converters\FlagPathConverter.cs" />
-    <Compile Include="Samples\DataGrid\UniqueIDCellValidationRule.cs" />
-    <Compile Include="Samples\DataGrid\Views\DataGridView.xaml.cs">
-      <DependentUpon>DataGridView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\DataGrid\Views\MultiColumnComboBoxView.xaml.cs">
-      <DependentUpon>MultiColumnComboBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\DateTime\Converters\CustomFormatToBoolConverter.cs" />
-    <Compile Include="Samples\DateTime\Converters\DateTimeToTimeSpanConverter.cs" />
-    <Compile Include="Samples\DateTime\Views\DateTimeView.xaml.cs">
-      <DependentUpon>DateTimeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\FilePicker\Views\FilePickerView.xaml.cs">
-      <DependentUpon>FilePickerView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Gauge\Views\RadialGaugeView.xaml.cs">
-      <DependentUpon>RadialGaugeView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\ListBox\Converters\BoxArtImageSourceConverter.cs" />
-    <Compile Include="Samples\ListBox\Views\ListBoxView.xaml.cs">
-      <DependentUpon>ListBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Magnifier\Converters\ColorConverter.cs" />
-    <Compile Include="Samples\Magnifier\Converters\VisibilityConverter.cs" />
-    <Compile Include="Samples\Magnifier\Views\MagnifierView.xaml.cs">
-      <DependentUpon>MagnifierView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Converters\EqualsMinusOneConverter.cs" />
-    <Compile Include="Samples\MaterialControls\Data\RequiredRule.cs" />
-    <Compile Include="Samples\MaterialControls\Views\MaterialHamburgerView.xaml.cs">
-      <DependentUpon>MaterialHamburgerView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialComboBoxView.xaml.cs">
-      <DependentUpon>MaterialComboBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialDemoView.cs" />
-    <Compile Include="Samples\MaterialControls\Views\MaterialListBoxView.xaml.cs">
-      <DependentUpon>MaterialListBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialToolTipView.xaml.cs">
-      <DependentUpon>MaterialToolTipView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialDropDownView.xaml.cs">
-      <DependentUpon>MaterialDropDownView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialSwitchView.xaml.cs">
-      <DependentUpon>MaterialSwitchView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialFrameView.xaml.cs">
-      <DependentUpon>MaterialFrameView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialTabsView.xaml.cs">
-      <DependentUpon>MaterialTabsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml.cs">
-      <DependentUpon>MaterialProgressBarCircularView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialProgressBarView.xaml.cs">
-      <DependentUpon>MaterialProgressBarView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialRadioButtonView.xaml.cs">
-      <DependentUpon>MaterialRadioButtonView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialCheckBoxView.xaml.cs">
-      <DependentUpon>MaterialCheckBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialToastView.xaml.cs">
-      <DependentUpon>MaterialToastView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialSliderView.xaml.cs">
-      <DependentUpon>MaterialSliderView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialTextFieldView.xaml.cs">
-      <DependentUpon>MaterialTextFieldView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialButtonView.xaml.cs">
-      <DependentUpon>MaterialButtonView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MaterialControls\Views\MaterialControlsView.xaml.cs">
-      <DependentUpon>MaterialControlsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\MultiCalendar\Views\MultiCalendarView.xaml.cs">
-      <DependentUpon>MultiCalendarView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Numeric\Views\NumericView.xaml.cs">
-      <DependentUpon>NumericView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Panels\Converters\ComboBoxToVisibilityConverter.cs" />
-    <Compile Include="Samples\Panels\Views\SwitchPanelView.xaml.cs">
-      <DependentUpon>SwitchPanelView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Pie\Converters\SliceLabelConverter.cs" />
-    <Compile Include="Samples\Pie\Views\PieChartView.xaml.cs">
-      <DependentUpon>PieChartView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Pie\Views\PieProgressView.xaml.cs">
-      <DependentUpon>PieProgressView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Pie\Views\PieView.xaml.cs">
-      <DependentUpon>PieView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PileFlowPanel\Converters\FullNameStringConverter.cs" />
-    <Compile Include="Samples\PileFlowPanel\Views\PileFlowPanelView.xaml.cs">
-      <DependentUpon>PileFlowPanelView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Converters\DimensionConverter.cs" />
-    <Compile Include="Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml.cs">
-      <DependentUpon>LastNameUserControlEditor.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml.cs">
-      <DependentUpon>PropertyGridPropertyItemStyleView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml.cs">
-      <DependentUpon>PropertyGridDefinitionKeyView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml.cs">
-      <DependentUpon>PropertyGridEditorDefinitionsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml.cs">
-      <DependentUpon>PropertyGridAttributesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml.cs">
-      <DependentUpon>PropertyGridSelectedObjectView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml.cs">
-      <DependentUpon>PropertyGridCustomPropertyView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml.cs">
-      <DependentUpon>PropertyGridPropertiesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml.cs">
-      <DependentUpon>PropertyGridPropertiesSourceView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\DisplayLocalizationRes.Designer.cs">
-      <DependentUpon>DisplayLocalizationRes.resx</DependentUpon>
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml.cs">
-      <DependentUpon>PropertyGridBindingToStructsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml.cs">
-      <DependentUpon>PropertyGridCategoryOrderView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml.cs">
-      <DependentUpon>PropertyGridCustomEditorsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml.cs">
-      <DependentUpon>PropertyGridDefaultEditorsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml.cs">
-      <DependentUpon>PropertyGridDisplayLocalizationView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml.cs">
-      <DependentUpon>PropertyGridMultiSelectedObjectsView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml.cs">
-      <DependentUpon>PropertyGridSpecifyingPropertiesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml.cs">
-      <DependentUpon>PropertyGridExpandingNonPrimitivesView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\PropertyGrid\Views\PropertyGridView.xaml.cs">
-      <DependentUpon>PropertyGridView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\RangeSlider\Converters\AbsoluteAdditionConverter.cs" />
-    <Compile Include="Samples\RangeSlider\Converters\RangeSliderEnabledConverter.cs" />
-    <Compile Include="Samples\RangeSlider\Views\RangeSliderView.xaml.cs">
-      <DependentUpon>RangeSliderView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Rating\Views\RatingView.xaml.cs">
-      <DependentUpon>RatingView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\SlideShow\Views\SlideShowView.xaml.cs">
-      <DependentUpon>SlideShowView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\AutoSelectTextboxView.xaml.cs">
-      <DependentUpon>AutoSelectTextboxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\MaskedTextboxView.xaml.cs">
-      <DependentUpon>MaskedTextboxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\MultiLineTextEditorView.xaml.cs">
-      <DependentUpon>MultiLineTextEditorView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\RichTextboxView.xaml.cs">
-      <DependentUpon>RichTextboxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\WatermarkPasswordBoxView.xaml.cs">
-      <DependentUpon>WatermarkPasswordBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\WatermarkTextboxView.xaml.cs">
-      <DependentUpon>WatermarkTextboxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Theming\Converters\FlagPathConverter.cs" />
-    <Compile Include="Samples\Theming\Views\ThemingAvalonDockView.xaml.cs">
-      <DependentUpon>ThemingAvalonDockView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Theming\Views\ThemingCoreWPFView.xaml.cs">
-      <DependentUpon>ThemingCoreWPFView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Theming\Views\ThemingDataGridView.xaml.cs">
-      <DependentUpon>ThemingDataGridView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Theming\Views\ThemingExtendedToolkitView.xaml.cs">
-      <DependentUpon>ThemingExtendedToolkitView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Theming\Views\ThemingListBoxView.xaml.cs">
-      <DependentUpon>ThemingListBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\TimelinePanel\Views\TimelinePanelView.xaml.cs">
-      <DependentUpon>TimelinePanelView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\TimeSpan\Views\TimeSpanView.xaml.cs">
-      <DependentUpon>TimeSpanView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\ToggleSwitch\Views\ToggleSwitchView.xaml.cs">
-      <DependentUpon>ToggleSwitchView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Text\Views\TokenizedTextBoxView.xaml.cs">
-      <DependentUpon>TokenizedTextBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml.cs">
-      <DependentUpon>WatermarkComboBoxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Window\Converters\IntToBoolConverter.cs" />
-    <Compile Include="Samples\Window\Converters\WindowStateToBoolConverter.cs" />
-    <Compile Include="Samples\Window\Resources\WindowModelEditor.xaml.cs">
-      <DependentUpon>WindowModelEditor.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Window\Views\ChildWindowView.xaml.cs">
-      <DependentUpon>ChildWindowView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Window\Views\StyleableWindowView.xaml.cs">
-      <DependentUpon>StyleableWindowView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Window\Views\WindowContainerView.xaml.cs">
-      <DependentUpon>WindowContainerView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Wizard\Views\WizardView.xaml.cs">
-      <DependentUpon>WizardView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Samples\Zoombox\Converters\PointConverter.cs" />
-    <Compile Include="Samples\Zoombox\Converters\RectConverter.cs" />
-    <Compile Include="Samples\Zoombox\Converters\SimpleConverter.cs" />
-    <Compile Include="Samples\Zoombox\Converters\ViewFinderConverter.cs" />
-    <Compile Include="Samples\Zoombox\Converters\ViewNameConverter.cs" />
-    <Compile Include="Samples\Zoombox\Converters\ViewStackCountConverter.cs" />
-    <Compile Include="Samples\Zoombox\Views\ZoomboxView.xaml.cs">
-      <DependentUpon>ZoomboxView.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Service References\NorthwindDataService\Reference.cs">
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.Aero\Xceed.Wpf.AvalonDock.Themes.Aero.csproj" />
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.Metro\Xceed.Wpf.AvalonDock.Themes.Metro.csproj" />
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock.Themes.VS2010\Xceed.Wpf.AvalonDock.Themes.VS2010.csproj" />
+    <ProjectReference Include="..\Xceed.Wpf.AvalonDock\Xceed.Wpf.AvalonDock.csproj" />
+    <ProjectReference Include="..\Xceed.Wpf.DataGrid\Xceed.Wpf.DataGrid.csproj" />
+    <ProjectReference Include="..\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Update="Service References\NorthwindDataService\Reference.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Reference.datasvcmap</DependentUpon>
     </Compile>
-    <Page Include="HomeView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Core\CodeFormatting\CSharpFormat.cs" />
-    <Compile Include="Core\CodeFormatting\XamlFormat.cs" />
-    <Compile Include="Core\LiveExplorerTreeViewItem.cs" />
-    <Compile Include="DemoView.cs" />
-    <Compile Include="MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-      <SubType>Code</SubType>
-    </Compile>
-    <Page Include="Resources\LiveExplorerScrollViewer.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Resources\TextBlockStyles.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\AvalonDock\Views\AvalonDockView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\BusyIndicator\Resources\Common.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentTemplateView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\BusyIndicator\Views\BusyIndicatorCustomContentView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\BusyIndicator\Views\BusyIndicatorView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Button\Views\IconButtonView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Button\Views\ButtonSpinnerView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Button\Views\DropDownSplitButtonView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Calculator\Views\CalculatorView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartAxisView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartLegendView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartSeriesBasicTypesView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartSeriesDataPointsBindingView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartStylingAxesGridView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartStylingColumnSeriesView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartStylingLineSeriesView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Chart\Views\ChartStylingPieSeriesView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\CheckLists\Views\CheckListsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Color\Views\ColorView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\DataGrid\Views\DataGridView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\DataGrid\Views\MultiColumnComboBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\DateTime\Views\DateTimeView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\FilePicker\Views\FilePickerView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Gauge\Views\RadialGaugeView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\ListBox\Views\ListBoxView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Magnifier\Views\MagnifierView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Resources\CommonResources.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialHamburgerView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialComboBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialListBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialToolTipView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialDropDownView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialSwitchView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialFrameView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialTabsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialProgressBarCircularView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialProgressBarView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialRadioButtonView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialCheckBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialToastView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialSliderView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialTextFieldView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialButtonView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MaterialControls\Views\MaterialControlsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\MultiCalendar\Views\MultiCalendarView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Numeric\Views\NumericView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Panels\Views\SwitchPanelView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Pie\Views\PieChartView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Pie\Views\PieProgressView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Pie\Views\PieView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PileFlowPanel\Views\PileFlowPanelView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Resources\LastNameUserControlEditor.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridPropertyItemStyleView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridDefinitionKeyView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridEditorDefinitionsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridAttributesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridSelectedObjectView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridCustomPropertyView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridPropertiesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridPropertiesSourceView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridBindingToStructsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridCategoryOrderView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridCustomEditorsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridDefaultEditorsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridDisplayLocalizationView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridMultiSelectedObjectsView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridSpecifyingPropertiesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridExpandingNonPrimitivesView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\PropertyGrid\Views\PropertyGridView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\RangeSlider\Views\RangeSliderView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Rating\Views\RatingView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\SlideShow\Views\SlideShowView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Text\Views\AutoSelectTextboxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Text\Views\MaskedTextboxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Text\Views\MultiLineTextEditorView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Text\Views\RichTextboxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Text\Views\WatermarkPasswordBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Text\Views\WatermarkTextboxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Theming\ItemTemplates\Common.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Theming\Views\ThemingAvalonDockView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Theming\Views\ThemingCoreWPFView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Theming\Views\ThemingDataGridView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Theming\Views\ThemingExtendedToolkitView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Theming\Views\ThemingListBoxView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\TimelinePanel\Views\TimelinePanelView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\TimeSpan\Views\TimeSpanView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\ToggleSwitch\Views\ToggleSwitchView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Text\Views\TokenizedTextBoxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\WatermarkComboBox\Views\WatermarkComboBoxView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Window\Resources\FancyStyles.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Window\Resources\WindowModelEditor.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Window\Views\ChildWindowView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Window\Views\StyleableWindowView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Window\Views\WindowContainerView.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Samples\Wizard\Views\WizardView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Samples\Zoombox\Views\ZoomboxView.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Samples\PropertyGrid\Views\DisplayLocalizationRes.fr.resx">
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Samples\PropertyGrid\Views\DisplayLocalizationRes.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>DisplayLocalizationRes.Designer.cs</LastGenOutput>
+    <None Update="Properties\app.manifest">
       <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <None Include="app.config" />
-    <None Include="Properties\app.manifest">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
     <AppDesigner Include="Properties\" />
-    <None Include="Service References\NorthwindDataService\service.edmx" />
     <Resource Include="Samples\Magnifier\Resources\SampleText.rtf" />
   </ItemGroup>
   <ItemGroup>
@@ -1047,7 +217,7 @@
     </ServiceReferenceMetadataStorage>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Service References\NorthwindDataService\Reference.datasvcmap">
+    <None Update="Service References\NorthwindDataService\Reference.datasvcmap">
       <Generator>DataServiceClientGenerator</Generator>
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
@@ -1426,27 +596,27 @@
   <ItemGroup>
     <Resource Include="Samples\MaterialControls\OpenSourceImages\MaterialHamburger.png" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="8.0.0" />
+    <PackageReference Include="System.ServiceModel.Http" Version="8.0.0" />
+    <PackageReference Include="System.ServiceModel.Duplex" Version="6.0.0" />
+    <PackageReference Include="System.ServiceModel.NetTcp" Version="8.0.0" />
+    <PackageReference Include="System.ServiceModel.Security" Version="6.0.0" />
+    <PackageReference Include="System.ServiceModel.Federation" Version="8.0.0" />
+  </ItemGroup>
+  <PropertyGroup />
   <PropertyGroup>
-    <PreBuildEvent>echo Deleting old CodeFiles directory...
-@if exist "$(ProjectDir)CodeFiles" rmdir /s /q "$(ProjectDir)CodeFiles"
-echo Copying sample code files...
-for /d /r "$(ProjectDir)Samples" %25%25a in (Views) do @if exist "%25%25a" xcopy "%25%25a" "$(ProjectDir)CodeFiles" /s /Y /I /q &gt; NUL
-echo Renaming sample code files...
-for /f "tokens=*" %25%25f in ('dir "$(ProjectDir)CodeFiles\*.*" /b') do ( 
-move /y "$(ProjectDir)CodeFiles\%25%25f" "$(ProjectDir)CodeFiles\%25%25f.txt" &gt; NUL
-)
+    <PreBuildEvent>echo Deleting old CodeFiles directory...
+@if exist "$(ProjectDir)CodeFiles" rmdir /s /q "$(ProjectDir)CodeFiles"
+echo Copying sample code files...
+for /d /r "$(ProjectDir)Samples" %25%25a in (Views) do @if exist "%25%25a" xcopy "%25%25a" "$(ProjectDir)CodeFiles" /s /Y /I /q &gt; NUL
+echo Renaming sample code files...
+for /f "tokens=*" %25%25f in ('dir "$(ProjectDir)CodeFiles\*.*" /b') do ( 
+move /y "$(ProjectDir)CodeFiles\%25%25f" "$(ProjectDir)CodeFiles\%25%25f.txt" &gt; NUL
+)
 </PreBuildEvent>
   </PropertyGroup>
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
\ No newline at end of file
diff --git a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
index c6f8a6e9..ba626e84 100644
--- a/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
+++ b/ExtendedWPFToolkitSolution/Xceed.Wpf.Toolkit.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Xceed.Wpf.Toolkit.LiveExplorer", "Src\Xceed.Wpf.Toolkit.LiveExplorer\Xceed.Wpf.Toolkit.LiveExplorer.csproj", "{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.Toolkit.LiveExplorer", "Src\Xceed.Wpf.Toolkit.LiveExplorer\Xceed.Wpf.Toolkit.LiveExplorer.csproj", "{5E7DC9C8-3E27-400C-B84C-29FF9E710CB3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Xceed.Wpf.Toolkit", "Src\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj", "{72E591D6-8F83-4D8C-8F67-9C325E623234}"
 EndProject