From 2ee5e3685a1d7499bcc8b8e4b807c858d97a3472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E9=A9=9A=E9=8F=B5=EF=BC=88Jinhua=20=20Yan?=
 =?UTF-8?q?=EF=BC=89?= <yanjinhuamail@gmail.com>
Date: Mon, 27 May 2024 22:49:10 +0800
Subject: [PATCH] Revert "dev pull request master"

---
 src/WPFDevelopers.Net40/Themes/Generic.xaml   |  11 +-
 src/WPFDevelopers.Net40/Themes/Theme.xaml     | 469 ++++++++--------
 .../WPFDevelopers.Net40.csproj                |   4 +-
 src/WPFDevelopers.Net45x/Themes/Generic.xaml  |  11 +-
 src/WPFDevelopers.Net45x/Themes/Theme.xaml    | 499 +++++++++---------
 .../WPFDevelopers.Net45x.csproj               |   7 +-
 src/WPFDevelopers.Samples.Shared/App.xaml     |   2 -
 .../Controls/NavigateMenu/NavigateMenu.xaml   | 158 ------
 .../AcrylicBlurWindowExample.xaml             |  12 +-
 .../ExampleViews/AnimationAudioExample.xaml   |  14 +-
 .../AnimationNavigationBar3DExample.xaml      |  96 +---
 .../ExampleViews/BarrageExample.xaml          |   4 +-
 .../ExampleViews/BasicBarChartExample.xaml    |  57 ++
 ...e.xaml.cs => BasicBarChartExample.xaml.cs} |  21 +-
 .../ExampleViews/BasicControlsExample.xaml    |  96 ++--
 .../ExampleViews/BreatheLightExample.xaml     | 322 +++++------
 .../ExampleViews/BubblleControlExample.xaml   |  14 +-
 .../ExampleViews/CarouselExample.xaml         |   6 +-
 .../ExampleViews/CarouselExampleEx.xaml       |   6 +-
 .../ExampleViews/ChartBarExample.xaml         |  52 --
 .../ExampleViews/ChartLineExample.xaml        |  40 --
 .../ExampleViews/ChartLineExample.xaml.cs     |  62 ---
 .../ExampleViews/ChatEmojiExample.xaml        |   6 +-
 .../ExampleViews/CircularMenuExample.xaml     |   4 +-
 .../CircularProgressBarExample.xaml           |  10 +-
 .../CropAvatar/CropAvatarExample.xaml         |   2 +-
 .../CropAvatar/CropAvatarWindow.xaml          |   8 +-
 .../ExampleViews/CutImageExample.xaml         |   2 +-
 .../DrapView/Controls/ElementAdorner.cs       | 301 -----------
 .../DrapView/Controls/ThumbAdorner.cs         | 418 ---------------
 .../DrapView/Controls/ThumbAdorner2.cs        | 404 --------------
 .../DrapView/Controls/ThumbAngle.cs           |  99 ----
 .../DrapView/Controls/TransformThumb.cs       | 242 ---------
 .../DrapView/Controls/TransformThumb.xaml     |  25 -
 .../ExampleViews/DrapView/Datas/PrintState.cs |  15 -
 .../ExampleViews/DrapView/Datas/ShapeType.cs  |  21 -
 .../ExampleViews/DrapView/Datas/ThumbType.cs  |  15 -
 .../DrapView/DrapViewExample.xaml             | 159 ------
 .../DrapView/DrapViewExample.xaml.cs          | 229 --------
 .../DrawerMenu/DrawerMenuExample.xaml         |  54 +-
 .../ExampleViews/EdgeLightExample.xaml        |  10 +-
 .../Loading/BallLoadingExample.xaml           |   4 +-
 .../Loading/CycleLoadingExample.xaml          |   6 +-
 .../Loading/RingLoadingExample.xaml           |   4 +-
 .../Loading/RollLoadingExample.xaml           |   6 +-
 .../Loading/StreamerLoadingExample.xaml       |  10 +-
 .../Loading/WaitLoadingExample.xaml           |   4 +-
 .../ExampleViews/LoadingExample.xaml          |   9 -
 .../ExampleViews/LoadingExample.xaml.cs       |  30 +-
 .../ExampleViews/MagnifierExample.xaml        |   4 +-
 .../ExampleViews/MainWindow.xaml              |  34 +-
 .../ExampleViews/PaginationExample.xaml       |  12 +-
 ...darExample.xaml => RadarChartExample.xaml} |  20 +-
 ...mple.xaml.cs => RadarChartExample.xaml.cs} |  45 +-
 .../ExampleViews/RulerControlExample.xaml     |   8 +-
 .../ExampleViews/SixGirdViewExample.xaml      |  14 +-
 .../ExampleViews/SpotLightExample.xaml        |   6 +-
 .../ExampleViews/StarrySkyExample.xaml        |   8 +-
 .../ExampleViews/TaskbarItemInfoExample.xaml  |   6 +-
 .../ExampleViews/ThermometerExample.xaml      |   4 +-
 .../ExampleViews/VerifyCodeExample.xaml       |  10 +-
 .../Helpers/MenuEnum.cs                       |   6 +-
 .../Models/NavigateMenuModel.cs               |  12 +-
 .../ViewModels/MainVM.cs                      |  71 +--
 .../WPFDevelopers.Samples.Shared.projitems    |  43 +-
 .../WPFDevelopers.Samples40.csproj            |   4 +-
 .../WPFDevelopers.Samples45x.csproj           |   4 +-
 .../WPFDevelopers.SamplesCode.csproj          |  16 +-
 .../AnimationNavigationBar3D.cs               |  19 +-
 .../AnimationNavigationBar3DItem.cs           |  56 +-
 .../BaseControls/SliderRepeatButton.cs        |  32 --
 .../Controls/BaseControls/WDBorder.cs         |  56 --
 .../Controls/BasicBarChart/BasicBarChart.cs   | 118 +++++
 .../Controls/Charts/ChartBar.cs               |  32 --
 .../Controls/Charts/ChartBase.cs              | 150 ------
 .../Controls/Charts/ChartLine.cs              |  77 ---
 .../Controls/Charts/ChartRect.cs              |  83 ---
 .../Controls/Charts/ChartRound.cs             |  10 -
 .../Controls/CropImage/CropImage.cs           |   5 +-
 .../Controls/Loading/LoadingExt.cs            |  32 --
 .../Controls/MessageBox/MessageBox.cs         |  12 +-
 .../{WDMessageBox.cs => WPFMessageBox.cs}     |  61 +--
 .../Controls/NavigateMenu/NavigateMenu.cs     |  50 +-
 .../Controls/Pagination/Pagination.cs         |  11 -
 .../RadarChart.cs}                            | 127 ++---
 .../Controls/RadarChart/RadarModel.cs         |  33 ++
 .../Controls/ScreenCut/ScreenCaptureExt.cs    |   7 +-
 .../CornerRadiusToSurroundConverter.cs        |  63 ---
 .../Converts/WidthHeightToRectConverter.cs    |  21 -
 .../Core/Helpers/ControlsHelper.cs            |  20 -
 .../Core/Helpers/ElementHelper.cs             |  44 +-
 .../Core/Helpers/GeometryHelper.cs            | 156 ------
 .../Core/Helpers/Helper.cs                    |   7 +-
 .../Core/Helpers/Win32.cs                     |  10 +-
 src/WPFDevelopers.Shared/LanguageManager.cs   |  44 --
 .../Languages/Language.Designer.cs            | 111 ----
 .../Languages/Language.en-US.resx             | 186 -------
 .../Languages/Language.ko-KR.resx             | 186 -------
 .../Languages/Language.resx                   | 166 ------
 .../Styles/Styles.DataGrid.xaml               |  66 ++-
 .../Styles/Styles.DatePicker.xaml             |   2 +-
 .../Styles/Styles.Expander.xaml               |  66 +--
 .../Styles/Styles.GroupBox.xaml               |  10 +-
 .../Styles/Styles.ListBox.xaml                |  17 +-
 .../Styles/Styles.ListView.xaml               |  35 +-
 .../Styles/Styles.Menu.xaml                   |   7 +-
 .../Styles/Styles.MessageBox.xaml             |  35 +-
 .../Styles/Styles.PasswordBox.xaml            |  29 +-
 .../Styles/Styles.ProgressBar.xaml            |  10 +-
 .../Styles/Styles.Slider.xaml                 |  35 +-
 .../Styles/Styles.TabControl.xaml             |  37 +-
 .../Styles/Styles.TextBox.xaml                |  36 +-
 .../Styles/Styles.TreeView.xaml               |  11 +-
 .../Themes/AnimationNavigationBar3D.xaml      |  43 +-
 .../Themes/Basic/ControlBasic.xaml            |   3 -
 .../Themes/Basic/Dark.Color.xaml              |  76 +--
 .../Themes/Basic/Light.Color.xaml             |  12 -
 .../Themes/CropAvatar.xaml                    |   7 +-
 .../Themes/CropImage.xaml                     |   3 +-
 .../Themes/DrawerMenu.xaml                    |   8 +-
 src/WPFDevelopers.Shared/Themes/Message.xaml  |   5 +-
 .../Themes/NavigateMenu.xaml                  | 154 ++++++
 .../Themes/Pagination.xaml                    |  48 +-
 .../Themes/ScreenCut.xaml                     |  19 +-
 src/WPFDevelopers.Shared/Themes/Theme40.txt   |   1 +
 src/WPFDevelopers.Shared/Themes/Theme45x.txt  |   1 +
 .../WPFDevelopers.Shared.projitems            |  26 +-
 src/WPFDevelopers.sln                         |   2 -
 128 files changed, 1709 insertions(+), 5467 deletions(-)
 delete mode 100644 src/WPFDevelopers.Samples.Shared/Controls/NavigateMenu/NavigateMenu.xaml
 create mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml
 rename src/WPFDevelopers.Samples.Shared/ExampleViews/{ChartBarExample.xaml.cs => BasicBarChartExample.xaml.cs} (81%)
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml.cs
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ElementAdorner.cs
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAdorner.cs
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAdorner2.cs
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAngle.cs
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/TransformThumb.cs
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/TransformThumb.xaml
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/PrintState.cs
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/ShapeType.cs
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/ThumbType.cs
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/DrapViewExample.xaml
 delete mode 100644 src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/DrapViewExample.xaml.cs
 rename src/WPFDevelopers.Samples.Shared/ExampleViews/{ChartRadarExample.xaml => RadarChartExample.xaml} (75%)
 rename src/WPFDevelopers.Samples.Shared/ExampleViews/{ChartRadarExample.xaml.cs => RadarChartExample.xaml.cs} (69%)
 delete mode 100644 src/WPFDevelopers.Shared/Controls/BaseControls/SliderRepeatButton.cs
 delete mode 100644 src/WPFDevelopers.Shared/Controls/BaseControls/WDBorder.cs
 create mode 100644 src/WPFDevelopers.Shared/Controls/BasicBarChart/BasicBarChart.cs
 delete mode 100644 src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs
 delete mode 100644 src/WPFDevelopers.Shared/Controls/Charts/ChartBase.cs
 delete mode 100644 src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs
 delete mode 100644 src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs
 delete mode 100644 src/WPFDevelopers.Shared/Controls/Charts/ChartRound.cs
 delete mode 100644 src/WPFDevelopers.Shared/Controls/Loading/LoadingExt.cs
 rename src/WPFDevelopers.Shared/Controls/MessageBox/{WDMessageBox.cs => WPFMessageBox.cs} (74%)
 rename src/{WPFDevelopers.Samples.Shared => WPFDevelopers.Shared}/Controls/NavigateMenu/NavigateMenu.cs (67%)
 rename src/WPFDevelopers.Shared/Controls/{Charts/ChartRadar.cs => RadarChart/RadarChart.cs} (50%)
 create mode 100644 src/WPFDevelopers.Shared/Controls/RadarChart/RadarModel.cs
 delete mode 100644 src/WPFDevelopers.Shared/Core/Converts/CornerRadiusToSurroundConverter.cs
 delete mode 100644 src/WPFDevelopers.Shared/Core/Converts/WidthHeightToRectConverter.cs
 delete mode 100644 src/WPFDevelopers.Shared/Core/Helpers/GeometryHelper.cs
 delete mode 100644 src/WPFDevelopers.Shared/LanguageManager.cs
 delete mode 100644 src/WPFDevelopers.Shared/Languages/Language.Designer.cs
 delete mode 100644 src/WPFDevelopers.Shared/Languages/Language.en-US.resx
 delete mode 100644 src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx
 delete mode 100644 src/WPFDevelopers.Shared/Languages/Language.resx
 create mode 100644 src/WPFDevelopers.Shared/Themes/NavigateMenu.xaml

diff --git a/src/WPFDevelopers.Net40/Themes/Generic.xaml b/src/WPFDevelopers.Net40/Themes/Generic.xaml
index 04a35980..2847a498 100644
--- a/src/WPFDevelopers.Net40/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Generic.xaml
@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:control="clr-namespace:WPFDevelopers.Controls"
     xmlns:converts="clr-namespace:WPFDevelopers.Converts"
-    xmlns:resx="clr-namespace:WPFDevelopers"
     xmlns:shell="clr-namespace:Microsoft.Windows.Shell"
     xmlns:wd="clr-namespace:WPFDevelopers.Net40">
     <converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
@@ -75,8 +74,7 @@
                                                 Padding="0"
                                                 Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}"
                                                 IsTabStop="False"
-                                                Style="{DynamicResource WD.WindowButtonStyle}"
-                                                ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
+                                                Style="{DynamicResource WD.WindowButtonStyle}">
                                                 <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                                                     <Rectangle
                                                         x:Name="MinimizeGlyph"
@@ -92,8 +90,7 @@
                                                 Padding="0"
                                                 Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}"
                                                 IsTabStop="False"
-                                                Style="{DynamicResource WD.WindowButtonStyle}"
-                                                ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
+                                                Style="{DynamicResource WD.WindowButtonStyle}">
                                                 <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                                                     <Path
                                                         Width="10"
@@ -112,7 +109,6 @@
                                                 Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}"
                                                 IsTabStop="False"
                                                 Style="{DynamicResource WD.WindowButtonStyle}"
-                                                ToolTip="{Binding [Restore], Source={x:Static resx:LanguageManager.Instance}}"
                                                 Visibility="Collapsed">
                                                 <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                                                     <Path
@@ -132,8 +128,7 @@
                                             Name="PART_CloseButton"
                                             Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}"
                                             IsTabStop="False"
-                                            Style="{DynamicResource WD.WindowButtonStyle}"
-                                            ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
+                                            Style="{DynamicResource WD.WindowButtonStyle}">
                                             <Path
                                                 Width="10"
                                                 Height="10"
diff --git a/src/WPFDevelopers.Net40/Themes/Theme.xaml b/src/WPFDevelopers.Net40/Themes/Theme.xaml
index 03ddea0a..c7c95c67 100644
--- a/src/WPFDevelopers.Net40/Themes/Theme.xaml
+++ b/src/WPFDevelopers.Net40/Themes/Theme.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" po:Freeze="True" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:converts="clr-namespace:WPFDevelopers.Converts" xmlns:controls="clr-namespace:WPFDevelopers.Controls" xmlns:helpers="clr-namespace:WPFDevelopers.Helpers" xmlns:resx="clr-namespace:WPFDevelopers" xmlns:shell="clr-namespace:Microsoft.Windows.Shell" xmlns:wd="clr-namespace:WPFDevelopers.Net40" xmlns:shapes="clr-namespace:Microsoft.Expression.Drawing.Shapes" xmlns:ec="clr-namespace:Microsoft.Expression.Controls" xmlns:drawingControls="clr-namespace:Microsoft.Expression.Drawing.Controls" xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" po:Freeze="True" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:WPFDevelopers.Controls" xmlns:convert="clr-namespace:WPFDevelopers.Converts" xmlns:helpers="clr-namespace:WPFDevelopers.Helpers" xmlns:shell="clr-namespace:Microsoft.Windows.Shell" xmlns:wd="clr-namespace:WPFDevelopers.Net40" xmlns:shapes="clr-namespace:Microsoft.Expression.Drawing.Shapes" xmlns:ec="clr-namespace:Microsoft.Expression.Controls" xmlns:drawingControls="clr-namespace:Microsoft.Expression.Drawing.Controls" xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore">
 	<SolidColorBrush x:Key="WD.ButtonFocusVisualColor" po:Freeze="True" Color="#60000000" />
 	<Color x:Key="WD.ShadowDepthColor" po:Freeze="True">#AA000000</Color>
 	<Color x:Key="WD.PrimaryTextColor" po:Freeze="True">#909399</Color>
@@ -145,8 +145,6 @@
 	<sys:Double x:Key="WD.RepeatButtonSize">6</sys:Double>
 	<Thickness x:Key="WD.DefaultPadding">6</Thickness>
 	<BooleanToVisibilityConverter x:Key="WD.Bool2VisibilityConverter" />
-	<converts:CornerRadiusToSurroundConverter x:Key="WD.CornerRadiusToSurroundConverter" />
-	<converts:WidthHeightToRectConverter x:Key="WD.WidthHeightToRectConverter" />
 	<Thickness x:Key="WD.TabItemBorderThickness">0,0,0,2</Thickness>
 	<Style TargetType="ToolTip">
 		<Setter Property="Visibility" Value="Visible" />
@@ -159,16 +157,16 @@
 			</DataTrigger>
 		</Style.Triggers>
 	</Style>
-	<converts:WidthHeightEqualValueConverter x:Key="WD.WidthHeightEqualValueConverter" />
-	<converts:HalfValueConverter x:Key="WD.HalfValueConverter" />
-	<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
+	<convert:WidthHeightEqualValueConverter x:Key="WD.WidthHeightEqualValueConverter" />
+	<convert:HalfValueConverter x:Key="WD.HalfValueConverter" />
+	<convert:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
 	<ControlTemplate x:Key="WD.ComboBoxTextBox" TargetType="{x:Type TextBox}">
 		<Border Background="{TemplateBinding Background}" Focusable="False">
 			<ScrollViewer x:Name="PART_ContentHost" Background="Transparent" Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
 		</Border>
 	</ControlTemplate>
-	<converts:DatePickerToCurrentConverter x:Key="WD.DatePickerToCurrentConverter" />
-	<converts:DoubleMinConverter x:Key="WD.DoubleMinConverter" />
+	<convert:DatePickerToCurrentConverter x:Key="WD.DatePickerToCurrentConverter" />
+	<convert:DoubleMinConverter x:Key="WD.DoubleMinConverter" />
 	<ec:IsArrangedToScaleConverter x:Key="IsArrangedToScaleConverter" />
 	<ControlTemplate x:Key="ValidationToolTipTemplate">
 		<Grid Name="Root" Margin="5,0" Opacity="0" RenderTransformOrigin="0,0">
@@ -348,26 +346,26 @@
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
-	<converts:IndexToColor x:Key="WD.IndexToColor" />
-	<converts:AngleToPointConverter x:Key="WD.PrConverter" />
-	<converts:AngleToIsLargeConverter x:Key="WD.IsLargeConverter" />
-	<converts:StepIndexConverter x:Key="WD.StepIndexConverter" />
-	<converts:OrientationConverter x:Key="WD.OrientationConverter" />
-	<converts:BreadCrumbBarConvertr x:Key="WD.BreadCrumbBarConvertr" />
+	<convert:IndexToColor x:Key="WD.IndexToColor" />
+	<convert:AngleToPointConverter x:Key="WD.PrConverter" />
+	<convert:AngleToIsLargeConverter x:Key="WD.IsLargeConverter" />
+	<convert:StepIndexConverter x:Key="WD.StepIndexConverter" />
+	<convert:OrientationConverter x:Key="WD.OrientationConverter" />
+	<convert:BreadCrumbBarConvertr x:Key="WD.BreadCrumbBarConvertr" />
 	<Style x:Key="WD.MessageListBox" TargetType="{x:Type controls:MessageListBox}">
 		<Setter Property="BorderThickness" Value="0" />
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
 	</Style>
-	<converts:ColorToBrushConverter x:Key="WD.ColorToBrushConverter" />
-	<converts:ColorToRedConverter x:Key="WD.ColorToRedConverter" />
-	<converts:ColorToGreenConverter x:Key="WD.ColorToGreenConverter" />
-	<converts:ColorToBlueConverter x:Key="WD.ColorToBlueConverter" />
-	<converts:ColorTypeToVisibilityConverter x:Key="WD.ColorTypeToVisibilityConverter" />
-	<converts:ColorToStringConverter x:Key="WD.ColorToStringConverter" />
-	<converts:HToColorConverter x:Key="WD.HToColorConverter" />
-	<converts:SToColorConverter x:Key="WD.SToColorConverter" />
-	<converts:LToColorConverter x:Key="WD.LToColorConverter" />
+	<convert:ColorToBrushConverter x:Key="WD.ColorToBrushConverter" />
+	<convert:ColorToRedConverter x:Key="WD.ColorToRedConverter" />
+	<convert:ColorToGreenConverter x:Key="WD.ColorToGreenConverter" />
+	<convert:ColorToBlueConverter x:Key="WD.ColorToBlueConverter" />
+	<convert:ColorTypeToVisibilityConverter x:Key="WD.ColorTypeToVisibilityConverter" />
+	<convert:ColorToStringConverter x:Key="WD.ColorToStringConverter" />
+	<convert:HToColorConverter x:Key="WD.HToColorConverter" />
+	<convert:SToColorConverter x:Key="WD.SToColorConverter" />
+	<convert:LToColorConverter x:Key="WD.LToColorConverter" />
 	<LinearGradientBrush x:Key="WD.ColorPickerRainbowBrush" po:Freeze="True">
 		<GradientStop Color="#FF0000" />
 		<GradientStop Offset="0.167" Color="#FF00FF" />
@@ -774,23 +772,23 @@
 									<TextBlock x:Name="PART_Title" Grid.Column="1" Margin="6,0" VerticalAlignment="Center" FontSize="{DynamicResource WD.TitleFontSize}" Foreground="{DynamicResource WD.WindowForegroundColorBrush}" Text="{TemplateBinding Title}" />
 									<WrapPanel Grid.Column="2" Margin="0,6" shell:WindowChrome.IsHitTestVisibleInChrome="True">
 										<WrapPanel x:Name="PART_MinAndMax">
-											<Button Name="PART_MinimizeButton" Padding="0" Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
+											<Button Name="PART_MinimizeButton" Padding="0" Command="{Binding Source={x:Static shell:SystemCommands.MinimizeWindowCommand}}" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 												<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
 													<Rectangle x:Name="MinimizeGlyph" Width="10" Height="1" Margin="0,7,0,0" VerticalAlignment="Bottom" Fill="{DynamicResource WD.WindowForegroundColorBrush}" />
 												</Grid>
 											</Button>
-											<Button Name="PART_MaximizeButton" Padding="0" Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
+											<Button Name="PART_MaximizeButton" Padding="0" Command="{Binding Source={x:Static shell:SystemCommands.MaximizeWindowCommand}}" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 												<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
 													<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowMaximizeGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" Stretch="Uniform" UseLayoutRounding="False" />
 												</Grid>
 											</Button>
-											<Button Name="PART_RestoreButton" Padding="0" Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Restore], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed">
+											<Button Name="PART_RestoreButton" Padding="0" Command="{Binding Source={x:Static shell:SystemCommands.RestoreWindowCommand}}" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" Visibility="Collapsed">
 												<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
 													<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowRestoreGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" Stretch="Uniform" UseLayoutRounding="False" />
 												</Grid>
 											</Button>
 										</WrapPanel>
-										<Button Name="PART_CloseButton" Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
+										<Button Name="PART_CloseButton" Command="{Binding Source={x:Static shell:SystemCommands.CloseWindowCommand}}" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 											<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" Stretch="Uniform" />
 										</Button>
 									</WrapPanel>
@@ -862,7 +860,7 @@
 					<Grid Margin="10,0,10,10">
 						<Border x:Name="SubmenuBorder" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1" CornerRadius="0,0,3,3" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True">
 							<ScrollViewer Margin="0,4" CanContentScroll="True">
-								<VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+								<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
 							</ScrollViewer>
 						</Border>
 						<Border Width="{Binding ElementName=Border, Path=ActualWidth}" Height="1.2" HorizontalAlignment="Left" VerticalAlignment="Top" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderThickness="1,0,0,0" />
@@ -942,9 +940,9 @@
 				<TextBlock x:Name="InputGestureText" Grid.Column="3" Margin="5,2,2,2" DockPanel.Dock="Right" Text="{TemplateBinding InputGestureText}" />
 				<Path x:Name="PART_Path" Grid.Column="4" Width="10" Height="12" VerticalAlignment="Center" Data="{StaticResource WD.ChevronRightGeometry}" Fill="{TemplateBinding Foreground}" FlowDirection="LeftToRight" Stretch="Uniform" />
 				<Popup x:Name="Popup" AllowsTransparency="True" Focusable="False" HorizontalOffset="2" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" PopupAnimation="Fade" VerticalOffset="-4">
-					<Border x:Name="SubmenuBorder" Margin="10,0,10,10" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1" CornerRadius="0,0,3,3" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True">
+					<Border x:Name="SubmenuBorder" Margin="10,0,10,10" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True">
 						<ScrollViewer Margin="0,4" CanContentScroll="True">
-							<VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+							<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
 						</ScrollViewer>
 					</Border>
 				</Popup>
@@ -1403,28 +1401,14 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="WD.SliderRepeatButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:SliderRepeatButton}">
+	<Style x:Key="WD.SliderRepeatButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RepeatButton}">
 		<Setter Property="OverridesDefaultStyle" Value="True" />
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="IsTabStop" Value="False" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:SliderRepeatButton}">
-					<Border x:Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" />
-					<ControlTemplate.Triggers>
-						<Trigger Property="RadiusOrientation" Value="Right">
-							<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Right}" />
-						</Trigger>
-						<Trigger Property="RadiusOrientation" Value="Left">
-							<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Left}" />
-						</Trigger>
-						<Trigger Property="RadiusOrientation" Value="Down">
-							<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}" />
-						</Trigger>
-						<Trigger Property="RadiusOrientation" Value="Up">
-							<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Up}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
+				<ControlTemplate TargetType="{x:Type RepeatButton}">
+					<Rectangle Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{TemplateBinding Background}" />
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -1441,10 +1425,10 @@
 				<TickBar x:Name="BottomTick" Grid.Row="2" Height="4" Margin="0,2,0,0" Fill="{TemplateBinding Foreground}" Placement="Bottom" Visibility="Collapsed" />
 				<Track x:Name="PART_Track" Grid.Row="1">
 					<Track.DecreaseRepeatButton>
-						<controls:SliderRepeatButton Height="{StaticResource WD.RepeatButtonSize}" Margin="0,2,0,0" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" RadiusOrientation="Right" Style="{DynamicResource WD.SliderRepeatButtonStyle}" />
+						<RepeatButton Height="{StaticResource WD.RepeatButtonSize}" Margin="0,2,0,0" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" Style="{DynamicResource WD.SliderRepeatButtonStyle}" />
 					</Track.DecreaseRepeatButton>
 					<Track.IncreaseRepeatButton>
-						<controls:SliderRepeatButton Height="{StaticResource WD.RepeatButtonSize}" Margin="0,2,0,0" Background="{DynamicResource WD.BaseSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" RadiusOrientation="Left" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
+						<RepeatButton Height="{StaticResource WD.RepeatButtonSize}" Margin="0,2,0,0" Background="{DynamicResource WD.BaseSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
 					</Track.IncreaseRepeatButton>
 					<Track.Thumb>
 						<Thumb Style="{StaticResource WD.SliderThumbStyle}" />
@@ -1477,10 +1461,10 @@
 				<TickBar x:Name="BottomTick" Grid.Column="2" Width="4" Margin="2,0,0,0" Fill="{TemplateBinding Foreground}" Placement="Right" Visibility="Collapsed" />
 				<Track x:Name="PART_Track" Grid.Column="1">
 					<Track.DecreaseRepeatButton>
-						<controls:SliderRepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" RadiusOrientation="Up" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
+						<RepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
 					</Track.DecreaseRepeatButton>
 					<Track.IncreaseRepeatButton>
-						<controls:SliderRepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.LightSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" RadiusOrientation="Down" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
+						<RepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.LightSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
 					</Track.IncreaseRepeatButton>
 					<Track.Thumb>
 						<Thumb Style="{StaticResource WD.SliderThumbStyle}" />
@@ -1628,9 +1612,6 @@
 						<controls:SmallPanel>
 							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" Visibility="Collapsed" />
 							<ScrollViewer x:Name="PART_ContentHost" />
-							<Button x:Name="PART_CloseButton" Width="20" Height="20" Margin="0,0,4,0" HorizontalAlignment="Right" helpers:ElementHelper.IsClear="{Binding Path=(helpers:ElementHelper.IsClear), RelativeSource={RelativeSource TemplatedParent}}" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}" ToolTip="{Binding [Clear], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed">
-								<controls:PathIcon Width="10" Height="10" Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}" Kind="WindowClose" />
-							</Button>
 						</controls:SmallPanel>
 					</Border>
 					<ControlTemplate.Triggers>
@@ -1643,23 +1624,6 @@
 						<Trigger Property="IsMouseOver" Value="True">
 							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
 						</Trigger>
-						<Trigger Property="helpers:ElementHelper.IsClear" Value="True">
-							<Setter TargetName="PART_CloseButton" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="helpers:ElementHelper.IsClear" Value="True" />
-								<Condition Property="Text" Value="{x:Null}" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_CloseButton" Property="Visibility" Value="Collapsed" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="helpers:ElementHelper.IsClear" Value="True" />
-								<Condition Property="Text" Value="" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_CloseButton" Property="Visibility" Value="Collapsed" />
-						</MultiTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>
@@ -2239,7 +2203,7 @@
 						</DataTemplate>
 					</ControlTemplate.Resources>
 					<controls:SmallPanel x:Name="PART_Root" Margin="{TemplateBinding Margin}">
-						<Border Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType=Calendar}}" SnapsToDevicePixels="True" UseLayoutRounding="True">
+						<Border Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True" UseLayoutRounding="True">
 							<Border.Effect>
 								<DropShadowEffect BlurRadius="12" Opacity="0.1" ShadowDepth="2" Color="{DynamicResource WD.BlackColor}" />
 							</Border.Effect>
@@ -2414,6 +2378,14 @@
 								<SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
 							</Polygon.Fill>
 						</Polygon>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal" />
+								<VisualState x:Name="MouseOver" />
+								<VisualState x:Name="Pressed" />
+								<VisualState x:Name="Disabled" />
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
 					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsMouseOver" Value="True">
@@ -2426,7 +2398,7 @@
 	</Style>
 	<Style x:Key="WD.DefaultDataGrid" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DataGrid}">
 		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderThickness" Value="1,1,1,0" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="Background" Value="{x:Null}" />
 		<Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
@@ -2439,29 +2411,24 @@
 		<Setter Property="AutoGenerateColumns" Value="False" />
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="RowHeaderWidth" Value="0" />
-		<Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
-		<Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-		<Setter Property="ScrollViewer.PanningMode" Value="VerticalOnly" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type DataGrid}">
-					<controls:WDBorder x:Name="DGR_Border" Padding="0,0,0,.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
-						<ScrollViewer x:Name="DG_ScrollViewer" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" Focusable="False">
+					<Border x:Name="DGR_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+						<ScrollViewer x:Name="DG_ScrollViewer" Focusable="False">
 							<ScrollViewer.Template>
 								<ControlTemplate TargetType="{x:Type ScrollViewer}">
 									<Grid>
 										<Grid.ColumnDefinitions>
 											<ColumnDefinition Width="Auto" />
 											<ColumnDefinition Width="*" />
-											<ColumnDefinition Width="Auto" />
 										</Grid.ColumnDefinitions>
 										<Grid.RowDefinitions>
 											<RowDefinition Height="Auto" />
 											<RowDefinition Height="*" />
 											<RowDefinition Height="Auto" />
 										</Grid.RowDefinitions>
-										<Button x:Name="PART_DataGridSelectAllButton" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid}, Converter={StaticResource WD.DoubleMinConverter}}" Command="{x:Static DataGrid.SelectAllCommand}" Focusable="False" Style="{StaticResource WD.DefaultDataGridSelectAllButtonStyle}" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
+										<Button Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid}, Converter={StaticResource WD.DoubleMinConverter}}" Command="{x:Static DataGrid.SelectAllCommand}" Focusable="False" Style="{StaticResource WD.DefaultDataGridSelectAllButtonStyle}" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
 										<DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
 										<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.Row="1" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" />
 										<ScrollBar x:Name="PART_VerticalScrollBar" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Right" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
@@ -2477,7 +2444,13 @@
 							</ScrollViewer.Template>
 							<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 						</ScrollViewer>
-					</controls:WDBorder>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Disabled" />
+								<VisualState x:Name="Normal" />
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Border>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -2598,7 +2571,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type DataGridRowHeader}">
 					<controls:SmallPanel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-						<Border x:Name="DGR_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+						<Border x:Name="rowHeaderBorder" Background="{TemplateBinding Background}">
 							<StackPanel Orientation="Horizontal">
 								<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.FontWeight="{TemplateBinding FontWeight}" />
 								<Control SnapsToDevicePixels="false" Template="{Binding ValidationErrorTemplate, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" Visibility="{Binding (Validation.HasError), Converter={StaticResource WD.Bool2VisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" />
@@ -2606,6 +2579,26 @@
 						</Border>
 						<Thumb x:Name="PART_TopHeaderGripper" VerticalAlignment="Top" Style="{StaticResource WD.RowHeaderGripperStyle}" />
 						<Thumb x:Name="PART_BottomHeaderGripper" VerticalAlignment="Bottom" Style="{StaticResource WD.RowHeaderGripperStyle}" />
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal" />
+								<VisualState x:Name="Normal_CurrentRow" />
+								<VisualState x:Name="Unfocused_EditingRow" />
+								<VisualState x:Name="Normal_EditingRow" />
+								<VisualState x:Name="MouseOver" />
+								<VisualState x:Name="MouseOver_CurrentRow" />
+								<VisualState x:Name="MouseOver_Unfocused_EditingRow" />
+								<VisualState x:Name="MouseOver_EditingRow" />
+								<VisualState x:Name="MouseOver_Unfocused_Selected" />
+								<VisualState x:Name="MouseOver_Selected" />
+								<VisualState x:Name="MouseOver_Unfocused_CurrentRow_Selected" />
+								<VisualState x:Name="MouseOver_CurrentRow_Selected" />
+								<VisualState x:Name="Unfocused_Selected" />
+								<VisualState x:Name="Unfocused_CurrentRow_Selected" />
+								<VisualState x:Name="Normal_CurrentRow_Selected" />
+								<VisualState x:Name="Normal_Selected" />
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
 					</controls:SmallPanel>
 				</ControlTemplate>
 			</Setter.Value>
@@ -2648,7 +2641,7 @@
 						</Storyboard>
 					</ControlTemplate.Resources>
 					<controls:SmallPanel>
-						<Border x:Name="DGR_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+						<Border x:Name="columnHeaderBorder" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
 							<Grid Name="HedearGrid">
 								<Grid.ColumnDefinitions>
 									<ColumnDefinition Width="*" />
@@ -2732,6 +2725,11 @@
 									</Storyboard>
 								</VisualState>
 							</VisualStateGroup>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal" />
+								<VisualState x:Name="MouseOver" />
+								<VisualState x:Name="Disabled" />
+							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 					</controls:SmallPanel>
 					<ControlTemplate.Triggers>
@@ -2775,6 +2773,11 @@
 									</Storyboard>
 								</VisualState>
 							</VisualStateGroup>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal" />
+								<VisualState x:Name="MouseOver" />
+								<VisualState x:Name="Disabled" />
+							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 					</controls:SmallPanel>
 					<ControlTemplate.Triggers>
@@ -2811,12 +2814,12 @@
 		<Setter Property="HorizontalContentAlignment" Value="Center" />
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+		<Setter Property="Padding" Value="2" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type TabControl}">
-					<controls:WDBorder x:Name="PART_Border" Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
-						<Grid Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}">
+					<Border Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<Grid ClipToBounds="True" KeyboardNavigation.TabNavigation="Local" SnapsToDevicePixels="True">
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Name="ColumnDefinition0" />
 								<ColumnDefinition Name="ColumnDefinition1" Width="0" />
@@ -2825,14 +2828,14 @@
 								<RowDefinition Name="RowDefinition0" Height="Auto" />
 								<RowDefinition Name="RowDefinition1" Height="*" />
 							</Grid.RowDefinitions>
-							<Border x:Name="HeaderBorder" Grid.Row="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0,0,0,1" ClipToBounds="True" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}" SnapsToDevicePixels="True">
-								<TabPanel Name="HeaderPanel" Panel.ZIndex="1" IsItemsHost="True" KeyboardNavigation.TabIndex="1" />
+							<Border x:Name="HeaderBorder" Grid.Row="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0,0,0,1">
+								<TabPanel Name="HeaderPanel" Margin="2,2,2,0" Panel.ZIndex="1" IsItemsHost="True" KeyboardNavigation.TabIndex="1" />
 							</Border>
 							<controls:SmallPanel x:Name="ContentPanel" Grid.Row="1" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
 								<ContentPresenter Name="PART_SelectedContentHost" Margin="{TemplateBinding Padding}" Content="{TemplateBinding SelectedContent}" ContentSource="SelectedContent" ContentStringFormat="{TemplateBinding SelectedContentStringFormat}" ContentTemplate="{TemplateBinding SelectedContentTemplate}" SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
 							</controls:SmallPanel>
 						</Grid>
-					</controls:WDBorder>
+					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="TabControl.TabStripPlacement" Value="Bottom">
 							<Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
@@ -2840,7 +2843,6 @@
 							<Setter TargetName="HeaderBorder" Property="Grid.Row" Value="1" />
 							<Setter TargetName="ContentPanel" Property="Grid.Row" Value="0" />
 							<Setter TargetName="HeaderBorder" Property="BorderThickness" Value="0,1,0,0" />
-							<Setter TargetName="HeaderBorder" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Up}" />
 							<Setter Property="ItemContainerStyle" Value="{StaticResource WD.BottomTabItem}" />
 						</Trigger>
 						<Trigger Property="TabControl.TabStripPlacement" Value="Left">
@@ -2851,7 +2853,6 @@
 							<Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
 							<Setter TargetName="RowDefinition1" Property="RowDefinition.Height" Value="0" />
 							<Setter TargetName="HeaderBorder" Property="BorderThickness" Value="0,0,1,0" />
-							<Setter TargetName="HeaderBorder" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Right}" />
 							<Setter Property="ItemContainerStyle" Value="{StaticResource WD.LeftTabItem}" />
 						</Trigger>
 						<Trigger Property="TabControl.TabStripPlacement" Value="Right">
@@ -2863,7 +2864,6 @@
 							<Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
 							<Setter TargetName="RowDefinition1" Property="RowDefinition.Height" Value="0" />
 							<Setter TargetName="HeaderBorder" Property="BorderThickness" Value="1,0,0,0" />
-							<Setter TargetName="HeaderBorder" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Left}" />
 							<Setter Property="ItemContainerStyle" Value="{StaticResource WD.RightTabItem}" />
 						</Trigger>
 					</ControlTemplate.Triggers>
@@ -2891,9 +2891,6 @@
 						<controls:SmallPanel>
 							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" FontSize="{TemplateBinding FontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
 							<ScrollViewer x:Name="PART_ContentHost" />
-							<Button x:Name="PART_CloseButton" Width="20" Height="20" Margin="0,0,4,0" HorizontalAlignment="Right" helpers:ElementHelper.IsClear="{Binding Path=(helpers:ElementHelper.IsClear), RelativeSource={RelativeSource TemplatedParent}}" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}" ToolTip="{Binding [Clear], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed">
-								<controls:PathIcon Width="10" Height="10" Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}" Kind="WindowClose" />
-							</Button>
 						</controls:SmallPanel>
 					</Border>
 					<ControlTemplate.Triggers>
@@ -2903,16 +2900,6 @@
 						<Trigger Property="IsMouseOver" Value="True">
 							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
 						</Trigger>
-						<Trigger Property="helpers:ElementHelper.IsClear" Value="True">
-							<Setter TargetName="PART_CloseButton" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="helpers:ElementHelper.IsClear" Value="True" />
-								<Condition Property="helpers:PasswordBoxHelper.PasswordLength" Value="0" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_CloseButton" Property="Visibility" Value="Collapsed" />
-						</MultiTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>
@@ -2924,21 +2911,20 @@
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
 		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.LighterSolidColorBrush}" />
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Expander}">
-					<Border x:Name="PART_BorderRoot" Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" ClipToBounds="True" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
+					<Border Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
 						<DockPanel>
-							<ToggleButton x:Name="HeaderSite" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" DockPanel.Dock="Top" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
+							<ToggleButton x:Name="HeaderSite" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" DockPanel.Dock="Top" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
 								<ToggleButton.Style>
 									<Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-										<Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type Expander}}}" />
 										<Setter Property="Template">
 											<Setter.Value>
 												<ControlTemplate TargetType="{x:Type ToggleButton}">
-													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.ColumnDefinitions>
 																<ColumnDefinition Width="19" />
@@ -2970,18 +2956,13 @@
 															</VisualStateGroup>
 														</VisualStateManager.VisualStateGroups>
 													</Border>
-													<ControlTemplate.Triggers>
-														<Trigger Property="IsChecked" Value="True">
-															<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}" />
-														</Trigger>
-													</ControlTemplate.Triggers>
 												</ControlTemplate>
 											</Setter.Value>
 										</Setter>
 									</Style>
 								</ToggleButton.Style>
 							</ToggleButton>
-							<Border x:Name="PART_Content" DockPanel.Dock="Bottom" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True" Visibility="Collapsed">
+							<Border x:Name="PART_Content" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="0" DockPanel.Dock="Bottom" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True" Visibility="Collapsed">
 								<Border.RenderTransform>
 									<ScaleTransform ScaleY="0" />
 								</Border.RenderTransform>
@@ -2992,8 +2973,6 @@
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsExpanded" Value="True">
 							<Setter TargetName="PART_Content" Property="Visibility" Value="Visible" />
-							<Setter TargetName="PART_BorderRoot" Property="BorderThickness" Value="1" />
-							<Setter TargetName="HeaderSite" Property="BorderThickness" Value="0" />
 						</Trigger>
 						<Trigger Property="ExpandDirection" Value="Right">
 							<Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Right" />
@@ -3007,11 +2986,10 @@
 							<Setter TargetName="HeaderSite" Property="Style">
 								<Setter.Value>
 									<Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-										<Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type Expander}}}" />
 										<Setter Property="Template">
 											<Setter.Value>
 												<ControlTemplate TargetType="{x:Type ToggleButton}">
-													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.RowDefinitions>
 																<RowDefinition Height="19" />
@@ -3050,11 +3028,6 @@
 															</VisualStateGroup>
 														</VisualStateManager.VisualStateGroups>
 													</Border>
-													<ControlTemplate.Triggers>
-														<Trigger Property="IsChecked" Value="True">
-															<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding (helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Right}" />
-														</Trigger>
-													</ControlTemplate.Triggers>
 												</ControlTemplate>
 											</Setter.Value>
 										</Setter>
@@ -3069,11 +3042,10 @@
 							<Setter TargetName="HeaderSite" Property="Style">
 								<Setter.Value>
 									<Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-										<Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type Expander}}}" />
 										<Setter Property="Template">
 											<Setter.Value>
 												<ControlTemplate TargetType="{x:Type ToggleButton}">
-													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.ColumnDefinitions>
 																<ColumnDefinition Width="19" />
@@ -3107,11 +3079,6 @@
 															</VisualStateGroup>
 														</VisualStateManager.VisualStateGroups>
 													</Border>
-													<ControlTemplate.Triggers>
-														<Trigger Property="IsChecked" Value="True">
-															<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Up}" />
-														</Trigger>
-													</ControlTemplate.Triggers>
 												</ControlTemplate>
 											</Setter.Value>
 										</Setter>
@@ -3131,11 +3098,10 @@
 							<Setter TargetName="HeaderSite" Property="Style">
 								<Setter.Value>
 									<Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-										<Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type Expander}}}" />
 										<Setter Property="Template">
 											<Setter.Value>
 												<ControlTemplate TargetType="{x:Type ToggleButton}">
-													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.RowDefinitions>
 																<RowDefinition Height="19" />
@@ -3174,11 +3140,6 @@
 															</VisualStateGroup>
 														</VisualStateManager.VisualStateGroups>
 													</Border>
-													<ControlTemplate.Triggers>
-														<Trigger Property="IsChecked" Value="True">
-															<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Left}" />
-														</Trigger>
-													</ControlTemplate.Triggers>
 												</ControlTemplate>
 											</Setter.Value>
 										</Setter>
@@ -3192,7 +3153,6 @@
 								<Condition Property="ExpandDirection" Value="Down" />
 							</MultiTrigger.Conditions>
 							<Setter TargetName="PART_Content" Property="BorderThickness" Value="1,0,1,1" />
-							<Setter TargetName="HeaderSite" Property="BorderThickness" Value="0,0,0,1" />
 							<MultiTrigger.EnterActions>
 								<BeginStoryboard x:Name="PART_DownBeginStoryboard">
 									<Storyboard>
@@ -3210,7 +3170,6 @@
 								<Condition Property="ExpandDirection" Value="Right" />
 							</MultiTrigger.Conditions>
 							<Setter TargetName="PART_Content" Property="BorderThickness" Value="0,1,1,1" />
-							<Setter TargetName="HeaderSite" Property="BorderThickness" Value="0,0,1,0" />
 							<MultiTrigger.EnterActions>
 								<BeginStoryboard x:Name="PART_RightBeginStoryboard">
 									<Storyboard>
@@ -3228,7 +3187,6 @@
 								<Condition Property="ExpandDirection" Value="Up" />
 							</MultiTrigger.Conditions>
 							<Setter TargetName="PART_Content" Property="BorderThickness" Value="1,1,1,0" />
-							<Setter TargetName="HeaderSite" Property="BorderThickness" Value="0,1,0,0" />
 							<MultiTrigger.EnterActions>
 								<BeginStoryboard x:Name="PART_UpBeginStoryboard">
 									<Storyboard>
@@ -3246,7 +3204,6 @@
 								<Condition Property="ExpandDirection" Value="Left" />
 							</MultiTrigger.Conditions>
 							<Setter TargetName="PART_Content" Property="BorderThickness" Value="1,1,0,1" />
-							<Setter TargetName="HeaderSite" Property="BorderThickness" Value="1,0,0,0" />
 							<MultiTrigger.EnterActions>
 								<BeginStoryboard x:Name="PART_LeftBeginStoryboard">
 									<Storyboard>
@@ -3268,19 +3225,18 @@
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Background" Value="{DynamicResource WD.LighterSolidColorBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type GroupBox}">
-					<Grid Margin="{TemplateBinding Margin}">
+					<Grid>
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="*" />
 						</Grid.RowDefinitions>
-						<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}" SnapsToDevicePixels="True">
+						<Border Grid.Row="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1">
 							<ContentPresenter Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
 						</Border>
-						<Border Grid.Row="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,0,1,1" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Up}" SnapsToDevicePixels="True">
+						<Border Grid.Row="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,0,1,1" SnapsToDevicePixels="True">
 							<ContentPresenter Margin="{TemplateBinding Padding}" />
 						</Border>
 					</Grid>
@@ -3294,16 +3250,16 @@
 		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
 		<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderThickness" Value="0,1,0,0" />
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ListBox}">
-					<controls:WDBorder x:Name="Border" Margin="{TemplateBinding Margin}" Padding="0,0,0,.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
-						<ScrollViewer Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" Focusable="False">
+					<Border Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<ScrollViewer Focusable="False">
 							<VirtualizingStackPanel IsItemsHost="True" />
 						</ScrollViewer>
-					</controls:WDBorder>
+					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsGrouping" Value="True">
 							<Setter Property="ScrollViewer.CanContentScroll" Value="False" />
@@ -3358,16 +3314,20 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ScrollViewer}">
-					<controls:SmallPanel>
+					<Grid Background="{TemplateBinding Background}">
+						<Grid.RowDefinitions>
+							<RowDefinition Height="*" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
 						<DockPanel Margin="{TemplateBinding Padding}">
 							<ScrollViewer DockPanel.Dock="Top" Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
 								<GridViewHeaderRowPresenter AllowsColumnReorder="{Binding Path=TemplatedParent.View.AllowsColumnReorder, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContainerStyle="{Binding Path=TemplatedParent.View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContextMenu="{Binding Path=TemplatedParent.View.ColumnHeaderContextMenu, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderTemplate="{Binding Path=TemplatedParent.View.ColumnHeaderTemplate, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderTemplateSelector="{Binding Path=TemplatedParent.View.ColumnHeaderTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderToolTip="{Binding Path=TemplatedParent.View.ColumnHeaderToolTip, RelativeSource={RelativeSource TemplatedParent}}" Columns="{Binding Path=TemplatedParent.View.Columns, RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 							</ScrollViewer>
 							<ScrollContentPresenter Name="PART_ScrollContentPresenter" CanContentScroll="True" CanHorizontallyScroll="False" CanVerticallyScroll="False" KeyboardNavigation.DirectionalNavigation="Local" />
 						</DockPanel>
-						<ScrollBar Name="PART_HorizontalScrollBar" VerticalAlignment="Bottom" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{TemplateBinding HorizontalOffset}" />
+						<ScrollBar Name="PART_HorizontalScrollBar" Grid.Row="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{TemplateBinding HorizontalOffset}" />
 						<ScrollBar Name="PART_VerticalScrollBar" HorizontalAlignment="Right" Maximum="{TemplateBinding ScrollableHeight}" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{TemplateBinding VerticalOffset}" />
-					</controls:SmallPanel>
+					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -3430,24 +3390,8 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ListView}">
-					<Border Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
+					<Border Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
 						<ScrollViewer Style="{StaticResource WD.GridViewScrollViewerStyleKey}">
-							<ScrollViewer.Clip>
-								<RectangleGeometry>
-									<RectangleGeometry.RadiusX>
-										<Binding ElementName="Border" Path="CornerRadius.TopLeft" />
-									</RectangleGeometry.RadiusX>
-									<RectangleGeometry.RadiusY>
-										<Binding ElementName="Border" Path="CornerRadius.TopLeft" />
-									</RectangleGeometry.RadiusY>
-									<RectangleGeometry.Rect>
-										<MultiBinding Converter="{StaticResource WD.WidthHeightToRectConverter}">
-											<Binding Path="ActualWidth" RelativeSource="{RelativeSource AncestorType=ScrollViewer}" />
-											<Binding Path="ActualHeight" RelativeSource="{RelativeSource AncestorType=ScrollViewer}" />
-										</MultiBinding>
-									</RectangleGeometry.Rect>
-								</RectangleGeometry>
-							</ScrollViewer.Clip>
 							<ItemsPresenter />
 						</ScrollViewer>
 					</Border>
@@ -3512,12 +3456,12 @@
 							</PointAnimationUsingKeyFrames>
 						</Storyboard>
 					</ControlTemplate.Resources>
-					<controls:WDBorder x:Name="PART_TemplateRoot" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+					<Border x:Name="PART_TemplateRoot">
 						<controls:SmallPanel ClipToBounds="True" SnapsToDevicePixels="True">
-							<Border x:Name="PART_Border" Background="{DynamicResource WD.BaseSolidColorBrush}" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
+							<Border x:Name="PART_Border" Background="{DynamicResource WD.BaseSolidColorBrush}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
 							<Rectangle x:Name="PART_Track" />
 							<Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
-								<Border x:Name="Indicator" Background="{TemplateBinding Foreground}" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
+								<Border x:Name="Indicator" Background="{TemplateBinding Foreground}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
 							</Decorator>
 							<Rectangle x:Name="PART_Rectangle" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Visibility="Collapsed">
 								<Rectangle.RenderTransform>
@@ -3525,7 +3469,7 @@
 								</Rectangle.RenderTransform>
 							</Rectangle>
 						</controls:SmallPanel>
-					</controls:WDBorder>
+					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="Orientation" Value="Vertical">
 							<Setter Property="Height" Value="{x:Static sys:Double.NaN}" />
@@ -3541,6 +3485,7 @@
 							</Trigger.EnterActions>
 							<Setter TargetName="PART_Indicator" Property="Visibility" Value="Collapsed" />
 							<Setter TargetName="PART_Rectangle" Property="Visibility" Value="Visible" />
+							<Setter TargetName="PART_Border" Property="CornerRadius" Value="0" />
 							<Trigger.ExitActions>
 								<StopStoryboard BeginStoryboardName="IndeterminateStoryboard" />
 							</Trigger.ExitActions>
@@ -3600,11 +3545,11 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="TreeView">
-					<controls:WDBorder Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
-						<ScrollViewer CanContentScroll="False" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" Focusable="False">
+					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<ScrollViewer Padding="{TemplateBinding Padding}" CanContentScroll="False" Focusable="False">
 							<ItemsPresenter />
 						</ScrollViewer>
-					</controls:WDBorder>
+					</Border>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -3728,7 +3673,7 @@
 	</Style>
 	<Style BasedOn="{StaticResource WD.DefaultTreeView}" TargetType="{x:Type TreeView}" />
 	<Style BasedOn="{StaticResource WD.DefaultTreeViewItem}" TargetType="{x:Type TreeViewItem}" />
-	<Style x:Key="WD.WDMessageBox" TargetType="{x:Type controls:WDMessageBox}">
+	<Style x:Key="WD.WPFMessageBox" TargetType="{x:Type controls:WPFMessageBox}">
 		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
@@ -3743,7 +3688,7 @@
 		<Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:WDMessageBox}">
+				<ControlTemplate TargetType="{x:Type controls:WPFMessageBox}">
 					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
 						<Grid>
 							<Grid.RowDefinitions>
@@ -3754,7 +3699,7 @@
 							<controls:SmallPanel Grid.Row="0">
 								<DockPanel Margin="20,0,0,0">
 									<TextBlock x:Name="PART_Title" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="{StaticResource WD.TitleFontSize}" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-									<Button Name="PART_CloseButton" Margin="0,6" HorizontalAlignment="Right" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
+									<Button Name="PART_CloseButton" Margin="0,6" HorizontalAlignment="Right" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 										<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.PrimaryTextSolidColorBrush}" Stretch="Fill" />
 									</Button>
 								</DockPanel>
@@ -3765,12 +3710,10 @@
 									<TextBox x:Name="PART_Message" Width="Auto" MaxWidth="500" Padding="10,0" VerticalAlignment="Center" BorderThickness="0" FontSize="{DynamicResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" IsReadOnly="True" TextWrapping="Wrap" />
 								</DockPanel>
 							</controls:SmallPanel>
-							<controls:SmallPanel Grid.Row="2" Margin="140,20,10,10" HorizontalAlignment="Right">
+							<controls:SmallPanel Grid.Row="2" Margin="140,20,10,10">
 								<UniformGrid Height="38" Rows="1">
-									<Button x:Name="PART_ButtonYes" Width="60" Content="{Binding [Yes], Source={x:Static resx:LanguageManager.Instance}}" Style="{DynamicResource WD.PrimaryButton}" Visibility="Collapsed" />
-									<Button x:Name="PART_ButtonNo" Width="60" Margin="6,0,0,0" Content="{Binding [No], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed" />
-									<Button x:Name="PART_ButtonOK" Width="60" Margin="6,0,0,0" Content="{Binding [OK], Source={x:Static resx:LanguageManager.Instance}}" Style="{DynamicResource WD.PrimaryButton}" />
-									<Button x:Name="PART_ButtonCancel" Width="60" Margin="6,0,0,0" Content="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed" />
+									<Button x:Name="PART_ButtonCancel" Width="60" Content="取消" Visibility="Collapsed" />
+									<Button x:Name="PART_ButtonOK" Width="60" Margin="6,0,0,0" Content="确认" Style="{DynamicResource WD.PrimaryButton}" />
 								</UniformGrid>
 							</controls:SmallPanel>
 						</Grid>
@@ -3779,7 +3722,7 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style BasedOn="{StaticResource WD.WDMessageBox}" TargetType="{x:Type controls:WDMessageBox}" />
+	<Style BasedOn="{StaticResource WD.WPFMessageBox}" TargetType="{x:Type controls:WPFMessageBox}" />
 	<Style x:Key="WD.NormalLoading" TargetType="{x:Type controls:NormalLoading}">
 		<Setter Property="Width" Value="40" />
 		<Setter Property="Height" Value="40" />
@@ -5140,6 +5083,99 @@
 	<Style BasedOn="{StaticResource WD.CycleLoading}" TargetType="{x:Type controls:CycleLoading}" />
 	<Style BasedOn="{StaticResource WD.RollLoading}" TargetType="{x:Type controls:RollLoading}" />
 	<Style BasedOn="{StaticResource WD.RingLoading}" TargetType="{x:Type controls:RingLoading}" />
+	<ControlTemplate x:Key="WD.NavigateMenuLeft" TargetType="{x:Type controls:NavigateMenu}">
+		<controls:SmallPanel ClipToBounds="True">
+			<ListBox x:Name="PART_ListBox" Background="Transparent" BorderThickness="0" ItemsSource="{TemplateBinding ItemsSource}" ScrollViewer.VerticalScrollBarVisibility="Hidden" SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource AncestorType={x:Type controls:NavigateMenu}}}" SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource AncestorType={x:Type controls:NavigateMenu}}}">
+				<ListBox.ItemTemplate>
+					<DataTemplate>
+						<TextBlock Text="{Binding Content}" TextTrimming="CharacterEllipsis" />
+					</DataTemplate>
+				</ListBox.ItemTemplate>
+				<ListBox.ItemContainerStyle>
+					<Style BasedOn="{x:Null}" TargetType="ListBoxItem">
+						<Setter Property="VerticalContentAlignment" Value="Center" />
+						<Setter Property="Padding" Value="10,8" />
+						<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+						<Setter Property="Template">
+							<Setter.Value>
+								<ControlTemplate TargetType="{x:Type ListBoxItem}">
+									<Border x:Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+										<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+									</Border>
+									<ControlTemplate.Triggers>
+										<Trigger Property="IsSelected" Value="True">
+											<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+											<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
+										</Trigger>
+										<Trigger Property="IsMouseOver" Value="True">
+											<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
+										</Trigger>
+									</ControlTemplate.Triggers>
+								</ControlTemplate>
+							</Setter.Value>
+						</Setter>
+					</Style>
+				</ListBox.ItemContainerStyle>
+			</ListBox>
+			<Rectangle x:Name="PART_RectangleSlider" Width="3" Height="{TemplateBinding Height}" HorizontalAlignment="Right" Fill="{DynamicResource WD.LighterSolidColorBrush}" />
+			<Rectangle Width="3" Height="35" HorizontalAlignment="Right" VerticalAlignment="Top" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}">
+				<Rectangle.RenderTransform>
+					<TranslateTransform x:Name="PART_TranslateTransform" />
+				</Rectangle.RenderTransform>
+			</Rectangle>
+		</controls:SmallPanel>
+	</ControlTemplate>
+	<Style x:Key="WD.NavigateMenuItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListBoxItem}">
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Padding" Value="10,8" />
+		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type ListBoxItem}">
+					<Border x:Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsSelected" Value="True">
+							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="WD.NavigateMenuTop" TargetType="{x:Type controls:NavigateMenu}">
+		<Grid>
+			<Rectangle x:Name="PART_RectangleSlider" Width="{TemplateBinding Width}" Height="3" VerticalAlignment="Bottom" Fill="{DynamicResource WD.LighterSolidColorBrush}" />
+			<Rectangle Width="{TemplateBinding RectangleSelectWidth}" Height="3" HorizontalAlignment="Left" VerticalAlignment="Bottom" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}">
+				<Rectangle.RenderTransform>
+					<TranslateTransform x:Name="PART_TranslateTransform" />
+				</Rectangle.RenderTransform>
+			</Rectangle>
+			<ItemsPresenter />
+		</Grid>
+	</ControlTemplate>
+	<Style x:Key="WD.NavigateMenu" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:NavigateMenu}">
+		<Style.Triggers>
+			<Trigger Property="TabStripPlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource WD.NavigateMenuLeft}" />
+			</Trigger>
+			<Trigger Property="TabStripPlacement" Value="Top">
+				<Setter Property="ItemsPanel">
+					<Setter.Value>
+						<ItemsPanelTemplate>
+							<VirtualizingStackPanel Orientation="Horizontal" />
+						</ItemsPanelTemplate>
+					</Setter.Value>
+				</Setter>
+				<Setter Property="Template" Value="{StaticResource WD.NavigateMenuTop}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style BasedOn="{StaticResource WD.NavigateMenu}" TargetType="{x:Type controls:NavigateMenu}" />
 	<Style x:Key="WD.PageListBoxStyleKey" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListBox}">
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="BorderThickness" Value="0" />
@@ -5233,29 +5269,29 @@
 							<Border x:Name="PART_Border" Background="Transparent" BorderBrush="{DynamicResource WD.PrimaryNormalSolidColorBrush}" BorderThickness="2" Cursor="SizeAll" />
 							<Border x:Name="PART_EditBar" Panel.ZIndex="99" Background="{DynamicResource WD.BackgroundSolidColorBrush}" Effect="{StaticResource WD.PopupShadowDepth}" Visibility="Hidden">
 								<WrapPanel Margin="10,5" VerticalAlignment="Center">
-									<RadioButton x:Name="PART_RadioButtonRectangle" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Rectangle], Source={x:Static resx:LanguageManager.Instance}}">
+									<RadioButton x:Name="PART_RadioButtonRectangle" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="方框">
 										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Rectangle" />
 									</RadioButton>
-									<RadioButton x:Name="PART_RadioButtonEllipse" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Ellipse], Source={x:Static resx:LanguageManager.Instance}}">
+									<RadioButton x:Name="PART_RadioButtonEllipse" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="椭圆">
 										<Ellipse Width="19" Height="19" SnapsToDevicePixels="True" Stroke="{DynamicResource WD.RegularTextSolidColorBrush}" StrokeThickness="1.5" UseLayoutRounding="True" />
 									</RadioButton>
-									<RadioButton x:Name="PART_RadioButtonArrow" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Arrow], Source={x:Static resx:LanguageManager.Instance}}">
+									<RadioButton x:Name="PART_RadioButtonArrow" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="箭头">
 										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="ArrowRightTop" />
 									</RadioButton>
-									<RadioButton x:Name="PART_RadioButtonInk" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Ink], Source={x:Static resx:LanguageManager.Instance}}">
+									<RadioButton x:Name="PART_RadioButtonInk" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="画笔">
 										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Ink" />
 									</RadioButton>
-									<RadioButton x:Name="PART_RadioButtonText" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Text], Source={x:Static resx:LanguageManager.Instance}}">
+									<RadioButton x:Name="PART_RadioButtonText" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="文字">
 										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Text" />
 									</RadioButton>
 									<Rectangle Width="1" Height="18" Margin="4,0" Stroke="{DynamicResource WD.SecondaryTextSolidColorBrush}" />
-									<Button x:Name="PART_ButtonSave" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="{Binding [Save], Source={x:Static resx:LanguageManager.Instance}}">
+									<Button x:Name="PART_ButtonSave" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="保存">
 										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Save" />
 									</Button>
-									<Button x:Name="PART_ButtonCancel" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}">
+									<Button x:Name="PART_ButtonCancel" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="取消">
 										<controls:PathIcon Width="14" Height="14" Foreground="{StaticResource WD.DangerSolidColorBrush}" Kind="Cancel" />
 									</Button>
-									<Button x:Name="PART_ButtonComplete" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="{Binding [Complete], Source={x:Static resx:LanguageManager.Instance}}">
+									<Button x:Name="PART_ButtonComplete" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="完成">
 										<controls:PathIcon Width="20" Height="15" Foreground="{StaticResource WD.SuccessSolidColorBrush}" Kind="Complete" />
 									</Button>
 								</WrapPanel>
@@ -5368,9 +5404,6 @@
 							<Setter TargetName="Border" Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
 							<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
 						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="Border" Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-						</Trigger>
 						<Trigger Property="IsEnabled" Value="False">
 							<Setter TargetName="Border" Property="Background" Value="Transparent" />
 							<Setter TargetName="Border" Property="BorderBrush" Value="Transparent" />
@@ -5440,14 +5473,12 @@
 		<Setter Property="MenuIconColor" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
 		<Setter Property="SelectionIndicatorColor" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
 		<Setter Property="MenuItemForeground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="SelectedIndex" Value="0" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="controls:DrawerMenu">
-					<Grid>
+					<Grid Background="{TemplateBinding Background}">
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
 							<RowDefinition />
@@ -5505,10 +5536,10 @@
 							</Path.Data>
 						</Path>
 						<controls:SmallPanel x:Name="PART_Grid" Width="200" Height="200">
-							<Button x:Name="PART_ReplaceButton" Width="40" Height="40" HorizontalAlignment="Right" VerticalAlignment="Top" Style="{StaticResource WD.PathButton}" ToolTip="{Binding [Replace], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed">
+							<Button x:Name="PART_ReplaceButton" Width="40" Height="40" HorizontalAlignment="Right" VerticalAlignment="Top" Style="{StaticResource WD.PathButton}" Visibility="Collapsed">
 								<controls:PathIcon Width="15" Height="15" Foreground="{StaticResource WD.PrimaryNormalSolidColorBrush}" Kind="Replace" />
 							</Button>
-							<Button x:Name="PART_AddButton" Width="40" Height="40" Style="{StaticResource WD.PathButton}" ToolTip="{Binding [Select], Source={x:Static resx:LanguageManager.Instance}}">
+							<Button x:Name="PART_AddButton" Width="40" Height="40" Style="{StaticResource WD.PathButton}">
 								<controls:PathIcon Width="20" Height="20" Foreground="{StaticResource WD.PrimaryNormalSolidColorBrush}" Kind="Add" />
 							</Button>
 						</controls:SmallPanel>
@@ -5994,7 +6025,7 @@
 						<Rectangle x:Name="PART_RectangleTop" Style="{DynamicResource WD.ScreenCutRectangleStyle}" />
 						<Rectangle x:Name="PART_RectangleRight" Style="{DynamicResource WD.ScreenCutRectangleStyle}" />
 						<Rectangle x:Name="PART_RectangleBottom" Style="{DynamicResource WD.ScreenCutRectangleStyle}" />
-						<Border x:Name="PART_Border" Background="Transparent" BorderBrush="{DynamicResource WD.PrimaryNormalSolidColorBrush}" BorderThickness="2" Cursor="SizeAll" Visibility="Collapsed" />
+						<Border x:Name="PART_Border" Background="Transparent" BorderBrush="{DynamicResource WD.PrimaryNormalSolidColorBrush}" BorderThickness="2" Cursor="SizeAll" />
 					</Canvas>
 				</ControlTemplate>
 			</Setter.Value>
@@ -6040,7 +6071,7 @@
 									<Path x:Name="PART_Path" Width="15" Height="15" Data="{StaticResource WD.InformationGeometry}" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Stretch="Fill" />
 									<TextBlock Grid.Column="1" Margin="5,0,0,0" VerticalAlignment="Center" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Content}" TextWrapping="Wrap" />
 								</DockPanel>
-								<Button x:Name="PART_CloseButton" Grid.Column="2" Width="25" Height="25" Margin="0,2,4,0" HorizontalAlignment="Right" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}" ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
+								<Button x:Name="PART_CloseButton" Grid.Column="2" Width="25" Height="25" Margin="0,2,4,0" HorizontalAlignment="Right" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}" ToolTip="关闭">
 									<controls:PathIcon Width="10" Height="10" Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}" Kind="WindowClose" />
 								</Button>
 							</Grid>
@@ -6614,17 +6645,9 @@
 					<ColumnDefinition Width="5" />
 					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
-				<WrapPanel VerticalAlignment="Center">
-					<TextBlock Text="{Binding [Total], Source={x:Static resx:LanguageManager.Instance}}" />
-					<TextBlock Text="{Binding Count, StringFormat=' {0} ', RelativeSource={RelativeSource TemplatedParent}}" />
-					<TextBlock Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
-				</WrapPanel>
+				<TextBlock VerticalAlignment="Center" Text="{Binding Count, StringFormat=共 {0} 条, RelativeSource={RelativeSource TemplatedParent}}" />
 				<controls:NumericBox x:Name="PART_CountPerPageNumericBox" Grid.Column="2" Width="32" VerticalContentAlignment="Center" Maximum="100000" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0" />
-				<WrapPanel Grid.Column="3" Margin="3,0,0,0" VerticalAlignment="Center">
-					<TextBlock Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
-					<TextBlock Text=" /  " />
-					<TextBlock Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
-				</WrapPanel>
+				<TextBlock Grid.Column="3" VerticalAlignment="Center" Text=" 条 / 页" />
 				<Button Grid.Column="5" Width="32" Command="{x:Static controls:Pagination.PrevCommand}">
 					<controls:PathIcon Kind="Previous" Style="{StaticResource WD.MiniPathIcon}" />
 				</Button>
@@ -6660,15 +6683,11 @@
 								<ColumnDefinition Width="Auto" />
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
-							<WrapPanel Margin="0,0,15,0" VerticalAlignment="Center">
-								<TextBlock Text="{Binding [Total], Source={x:Static resx:LanguageManager.Instance}}" />
-								<TextBlock Text="{Binding Count, StringFormat=' {0} ', RelativeSource={RelativeSource TemplatedParent}}" />
-								<TextBlock Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
-							</WrapPanel>
+							<TextBlock Margin="0,0,15,0" VerticalAlignment="Center" Text="{Binding Count, StringFormat=共 {0} 条, RelativeSource={RelativeSource TemplatedParent}}" />
 							<StackPanel Grid.Column="1" Margin="0,0,15,0" Orientation="Horizontal">
-								<TextBlock Margin="0,0,3,0" VerticalAlignment="Center" Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
+								<TextBlock VerticalAlignment="Center" Text="每页 " />
 								<controls:NumericBox x:Name="PART_CountPerPageNumericBox" Grid.Column="2" Width="32" VerticalContentAlignment="Center" FontSize="{TemplateBinding FontSize}" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0" />
-								<TextBlock Margin="3,0,0,0" VerticalAlignment="Center" Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
+								<TextBlock VerticalAlignment="Center" Text=" 条" />
 							</StackPanel>
 							<Button Grid.Column="2" Width="32" Command="{x:Static controls:Pagination.PrevCommand}">
 								<controls:PathIcon Kind="Previous" Style="{StaticResource WD.MiniPathIcon}" />
@@ -6684,9 +6703,9 @@
 								<controls:PathIcon Kind="Next" Style="{StaticResource WD.MiniPathIcon}" />
 							</Button>
 							<StackPanel Grid.Column="5" Orientation="Horizontal">
-								<TextBlock Margin="3,0" VerticalAlignment="Center" Text="{Binding [Goto], Source={x:Static resx:LanguageManager.Instance}}" />
+								<TextBlock VerticalAlignment="Center" Text=" 前往 " />
 								<controls:NumericBox x:Name="PART_JumpPageNumericBox" Width="32" VerticalContentAlignment="Center" FontSize="{TemplateBinding FontSize}" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0" />
-								<TextBlock Margin="3,0,0,0" VerticalAlignment="Center" Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
+								<TextBlock VerticalAlignment="Center" Text=" 页" />
 							</StackPanel>
 						</Grid>
 					</Border>
diff --git a/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj b/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
index 686e2ba2..2257a905 100644
--- a/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
+++ b/src/WPFDevelopers.Net40/WPFDevelopers.Net40.csproj
@@ -1,9 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-	<Import Project="../Package.props" />
+	<Import Project="../Package.props"/>
 	<PropertyGroup>
 		<TargetFramework>net40</TargetFramework>
-		<SignAssembly>True</SignAssembly>
-		<AssemblyOriginatorKeyFile>E:\Code\git\WPFDevelopers\WPFDevelopersMultiple\WPFDevelopers.snk</AssemblyOriginatorKeyFile>
 	</PropertyGroup>
 	<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
 	<Import Project="..\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />
diff --git a/src/WPFDevelopers.Net45x/Themes/Generic.xaml b/src/WPFDevelopers.Net45x/Themes/Generic.xaml
index b3e008ae..8a45c79e 100644
--- a/src/WPFDevelopers.Net45x/Themes/Generic.xaml
+++ b/src/WPFDevelopers.Net45x/Themes/Generic.xaml
@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:control="clr-namespace:WPFDevelopers.Controls"
     xmlns:converts="clr-namespace:WPFDevelopers.Converts"
-    xmlns:resx="clr-namespace:WPFDevelopers"
     xmlns:wd="clr-namespace:WPFDevelopers.Net45x">
     <converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
     <Style
@@ -81,8 +80,7 @@
                                                 Padding="0"
                                                 Command="SystemCommands.MinimizeWindowCommand"
                                                 IsTabStop="False"
-                                                Style="{DynamicResource WD.WindowButtonStyle}"
-                                                ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
+                                                Style="{DynamicResource WD.WindowButtonStyle}">
                                                 <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                                                     <Rectangle
                                                         x:Name="MinimizeGlyph"
@@ -98,8 +96,7 @@
                                                 Padding="0"
                                                 Command="SystemCommands.MaximizeWindowCommand"
                                                 IsTabStop="False"
-                                                Style="{DynamicResource WD.WindowButtonStyle}"
-                                                ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
+                                                Style="{DynamicResource WD.WindowButtonStyle}">
                                                 <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                                                     <Path
                                                         Width="10"
@@ -118,7 +115,6 @@
                                                 Command="SystemCommands.RestoreWindowCommand"
                                                 IsTabStop="False"
                                                 Style="{DynamicResource WD.WindowButtonStyle}"
-                                                ToolTip="{Binding [Restore], Source={x:Static resx:LanguageManager.Instance}}"
                                                 Visibility="Collapsed">
                                                 <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
                                                     <Path
@@ -138,8 +134,7 @@
                                             Name="PART_CloseButton"
                                             Command="SystemCommands.CloseWindowCommand"
                                             IsTabStop="False"
-                                            Style="{DynamicResource WD.WindowButtonStyle}"
-                                            ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
+                                            Style="{DynamicResource WD.WindowButtonStyle}">
                                             <Path
                                                 Width="10"
                                                 Height="10"
diff --git a/src/WPFDevelopers.Net45x/Themes/Theme.xaml b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
index a09c4935..30c8b2fd 100644
--- a/src/WPFDevelopers.Net45x/Themes/Theme.xaml
+++ b/src/WPFDevelopers.Net45x/Themes/Theme.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" po:Freeze="True" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:converts="clr-namespace:WPFDevelopers.Converts" xmlns:controls="clr-namespace:WPFDevelopers.Controls" xmlns:helpers="clr-namespace:WPFDevelopers.Helpers" xmlns:resx="clr-namespace:WPFDevelopers" xmlns:wd="clr-namespace:WPFDevelopers.Net45x" xmlns:shapes="clr-namespace:Microsoft.Expression.Drawing.Shapes" xmlns:ec="clr-namespace:Microsoft.Expression.Controls" xmlns:drawingControls="clr-namespace:Microsoft.Expression.Drawing.Controls" xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" po:Freeze="True" xmlns:sys="clr-namespace:System;assembly=mscorlib" xmlns:controls="clr-namespace:WPFDevelopers.Controls" xmlns:convert="clr-namespace:WPFDevelopers.Converts" xmlns:helpers="clr-namespace:WPFDevelopers.Helpers" xmlns:wd="clr-namespace:WPFDevelopers.Net45x" xmlns:shapes="clr-namespace:Microsoft.Expression.Drawing.Shapes" xmlns:ec="clr-namespace:Microsoft.Expression.Controls" xmlns:drawingControls="clr-namespace:Microsoft.Expression.Drawing.Controls" xmlns:input="clr-namespace:System.Windows.Input;assembly=PresentationCore">
 	<SolidColorBrush x:Key="WD.ButtonFocusVisualColor" po:Freeze="True" Color="#60000000" />
 	<Color x:Key="WD.ShadowDepthColor" po:Freeze="True">#AA000000</Color>
 	<Color x:Key="WD.PrimaryTextColor" po:Freeze="True">#909399</Color>
@@ -145,8 +145,6 @@
 	<sys:Double x:Key="WD.RepeatButtonSize">6</sys:Double>
 	<Thickness x:Key="WD.DefaultPadding">6</Thickness>
 	<BooleanToVisibilityConverter x:Key="WD.Bool2VisibilityConverter" />
-	<converts:CornerRadiusToSurroundConverter x:Key="WD.CornerRadiusToSurroundConverter" />
-	<converts:WidthHeightToRectConverter x:Key="WD.WidthHeightToRectConverter" />
 	<Thickness x:Key="WD.TabItemBorderThickness">0,0,0,2</Thickness>
 	<Style TargetType="ToolTip">
 		<Setter Property="Visibility" Value="Visible" />
@@ -159,16 +157,16 @@
 			</DataTrigger>
 		</Style.Triggers>
 	</Style>
-	<converts:WidthHeightEqualValueConverter x:Key="WD.WidthHeightEqualValueConverter" />
-	<converts:HalfValueConverter x:Key="WD.HalfValueConverter" />
-	<converts:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
+	<convert:WidthHeightEqualValueConverter x:Key="WD.WidthHeightEqualValueConverter" />
+	<convert:HalfValueConverter x:Key="WD.HalfValueConverter" />
+	<convert:ObjectNullToVisibilityConverter x:Key="ObjectNullToVisibilityConverter" />
 	<ControlTemplate x:Key="WD.ComboBoxTextBox" TargetType="{x:Type TextBox}">
 		<Border Background="{TemplateBinding Background}" Focusable="False">
 			<ScrollViewer x:Name="PART_ContentHost" Background="Transparent" Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden" />
 		</Border>
 	</ControlTemplate>
-	<converts:DatePickerToCurrentConverter x:Key="WD.DatePickerToCurrentConverter" />
-	<converts:DoubleMinConverter x:Key="WD.DoubleMinConverter" />
+	<convert:DatePickerToCurrentConverter x:Key="WD.DatePickerToCurrentConverter" />
+	<convert:DoubleMinConverter x:Key="WD.DoubleMinConverter" />
 	<ec:IsArrangedToScaleConverter x:Key="IsArrangedToScaleConverter" />
 	<ControlTemplate x:Key="ValidationToolTipTemplate">
 		<Grid Name="Root" Margin="5,0" Opacity="0" RenderTransformOrigin="0,0">
@@ -348,26 +346,26 @@
 			</Trigger>
 		</ControlTemplate.Triggers>
 	</ControlTemplate>
-	<converts:IndexToColor x:Key="WD.IndexToColor" />
-	<converts:AngleToPointConverter x:Key="WD.PrConverter" />
-	<converts:AngleToIsLargeConverter x:Key="WD.IsLargeConverter" />
-	<converts:StepIndexConverter x:Key="WD.StepIndexConverter" />
-	<converts:OrientationConverter x:Key="WD.OrientationConverter" />
-	<converts:BreadCrumbBarConvertr x:Key="WD.BreadCrumbBarConvertr" />
+	<convert:IndexToColor x:Key="WD.IndexToColor" />
+	<convert:AngleToPointConverter x:Key="WD.PrConverter" />
+	<convert:AngleToIsLargeConverter x:Key="WD.IsLargeConverter" />
+	<convert:StepIndexConverter x:Key="WD.StepIndexConverter" />
+	<convert:OrientationConverter x:Key="WD.OrientationConverter" />
+	<convert:BreadCrumbBarConvertr x:Key="WD.BreadCrumbBarConvertr" />
 	<Style x:Key="WD.MessageListBox" TargetType="{x:Type controls:MessageListBox}">
 		<Setter Property="BorderThickness" Value="0" />
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Hidden" />
 	</Style>
-	<converts:ColorToBrushConverter x:Key="WD.ColorToBrushConverter" />
-	<converts:ColorToRedConverter x:Key="WD.ColorToRedConverter" />
-	<converts:ColorToGreenConverter x:Key="WD.ColorToGreenConverter" />
-	<converts:ColorToBlueConverter x:Key="WD.ColorToBlueConverter" />
-	<converts:ColorTypeToVisibilityConverter x:Key="WD.ColorTypeToVisibilityConverter" />
-	<converts:ColorToStringConverter x:Key="WD.ColorToStringConverter" />
-	<converts:HToColorConverter x:Key="WD.HToColorConverter" />
-	<converts:SToColorConverter x:Key="WD.SToColorConverter" />
-	<converts:LToColorConverter x:Key="WD.LToColorConverter" />
+	<convert:ColorToBrushConverter x:Key="WD.ColorToBrushConverter" />
+	<convert:ColorToRedConverter x:Key="WD.ColorToRedConverter" />
+	<convert:ColorToGreenConverter x:Key="WD.ColorToGreenConverter" />
+	<convert:ColorToBlueConverter x:Key="WD.ColorToBlueConverter" />
+	<convert:ColorTypeToVisibilityConverter x:Key="WD.ColorTypeToVisibilityConverter" />
+	<convert:ColorToStringConverter x:Key="WD.ColorToStringConverter" />
+	<convert:HToColorConverter x:Key="WD.HToColorConverter" />
+	<convert:SToColorConverter x:Key="WD.SToColorConverter" />
+	<convert:LToColorConverter x:Key="WD.LToColorConverter" />
 	<LinearGradientBrush x:Key="WD.ColorPickerRainbowBrush" po:Freeze="True">
 		<GradientStop Color="#FF0000" />
 		<GradientStop Offset="0.167" Color="#FF00FF" />
@@ -775,23 +773,23 @@
 									<TextBlock x:Name="PART_Title" Grid.Column="1" Margin="6,0" VerticalAlignment="Center" FontSize="{DynamicResource WD.TitleFontSize}" Foreground="{DynamicResource WD.WindowForegroundColorBrush}" Text="{TemplateBinding Title}" />
 									<WrapPanel Grid.Column="2" Margin="0,6" WindowChrome.IsHitTestVisibleInChrome="True">
 										<WrapPanel x:Name="PART_MinAndMax">
-											<Button Name="PART_MinimizeButton" Padding="0" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Minimize], Source={x:Static resx:LanguageManager.Instance}}">
+											<Button Name="PART_MinimizeButton" Padding="0" Command="SystemCommands.MinimizeWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 												<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
 													<Rectangle x:Name="MinimizeGlyph" Width="10" Height="1" Margin="0,7,0,0" VerticalAlignment="Bottom" Fill="{DynamicResource WD.WindowForegroundColorBrush}" />
 												</Grid>
 											</Button>
-											<Button Name="PART_MaximizeButton" Padding="0" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Maximize], Source={x:Static resx:LanguageManager.Instance}}">
+											<Button Name="PART_MaximizeButton" Padding="0" Command="SystemCommands.MaximizeWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 												<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
 													<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowMaximizeGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" Stretch="Uniform" UseLayoutRounding="False" />
 												</Grid>
 											</Button>
-											<Button Name="PART_RestoreButton" Padding="0" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Restore], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed">
+											<Button Name="PART_RestoreButton" Padding="0" Command="SystemCommands.RestoreWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" Visibility="Collapsed">
 												<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
 													<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowRestoreGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" Stretch="Uniform" UseLayoutRounding="False" />
 												</Grid>
 											</Button>
 										</WrapPanel>
-										<Button Name="PART_CloseButton" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
+										<Button Name="PART_CloseButton" Command="SystemCommands.CloseWindowCommand" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 											<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{DynamicResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.WindowForegroundColorBrush}" Stretch="Uniform" />
 										</Button>
 									</WrapPanel>
@@ -863,7 +861,7 @@
 					<Grid Margin="10,0,10,10">
 						<Border x:Name="SubmenuBorder" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1" CornerRadius="0,0,3,3" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True">
 							<ScrollViewer Margin="0,4" CanContentScroll="True">
-								<VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+								<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
 							</ScrollViewer>
 						</Border>
 						<Border Width="{Binding ElementName=Border, Path=ActualWidth}" Height="1.2" HorizontalAlignment="Left" VerticalAlignment="Top" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderThickness="1,0,0,0" />
@@ -943,9 +941,9 @@
 				<TextBlock x:Name="InputGestureText" Grid.Column="3" Margin="5,2,2,2" DockPanel.Dock="Right" Text="{TemplateBinding InputGestureText}" />
 				<Path x:Name="PART_Path" Grid.Column="4" Width="10" Height="12" VerticalAlignment="Center" Data="{StaticResource WD.ChevronRightGeometry}" Fill="{TemplateBinding Foreground}" FlowDirection="LeftToRight" Stretch="Uniform" />
 				<Popup x:Name="Popup" AllowsTransparency="True" Focusable="False" HorizontalOffset="2" IsOpen="{Binding IsSubmenuOpen, RelativeSource={RelativeSource TemplatedParent}}" Placement="Right" PopupAnimation="Fade" VerticalOffset="-4">
-					<Border x:Name="SubmenuBorder" Margin="10,0,10,10" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1" CornerRadius="0,0,3,3" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True">
+					<Border x:Name="SubmenuBorder" Margin="10,0,10,10" Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" Effect="{StaticResource WD.PopupShadowDepth}" SnapsToDevicePixels="True">
 						<ScrollViewer Margin="0,4" CanContentScroll="True">
-							<VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+							<StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
 						</ScrollViewer>
 					</Border>
 				</Popup>
@@ -1404,28 +1402,14 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="WD.SliderRepeatButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:SliderRepeatButton}">
+	<Style x:Key="WD.SliderRepeatButtonStyle" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type RepeatButton}">
 		<Setter Property="OverridesDefaultStyle" Value="True" />
 		<Setter Property="Focusable" Value="False" />
 		<Setter Property="IsTabStop" Value="False" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:SliderRepeatButton}">
-					<Border x:Name="PART_Border" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Background="{TemplateBinding Background}" />
-					<ControlTemplate.Triggers>
-						<Trigger Property="RadiusOrientation" Value="Right">
-							<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Right}" />
-						</Trigger>
-						<Trigger Property="RadiusOrientation" Value="Left">
-							<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Left}" />
-						</Trigger>
-						<Trigger Property="RadiusOrientation" Value="Down">
-							<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}" />
-						</Trigger>
-						<Trigger Property="RadiusOrientation" Value="Up">
-							<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Up}" />
-						</Trigger>
-					</ControlTemplate.Triggers>
+				<ControlTemplate TargetType="{x:Type RepeatButton}">
+					<Rectangle Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" Fill="{TemplateBinding Background}" />
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -1442,10 +1426,10 @@
 				<TickBar x:Name="BottomTick" Grid.Row="2" Height="4" Margin="0,2,0,0" Fill="{TemplateBinding Foreground}" Placement="Bottom" Visibility="Collapsed" />
 				<Track x:Name="PART_Track" Grid.Row="1">
 					<Track.DecreaseRepeatButton>
-						<controls:SliderRepeatButton Height="{StaticResource WD.RepeatButtonSize}" Margin="0,2,0,0" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" RadiusOrientation="Right" Style="{DynamicResource WD.SliderRepeatButtonStyle}" />
+						<RepeatButton Height="{StaticResource WD.RepeatButtonSize}" Margin="0,2,0,0" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" Style="{DynamicResource WD.SliderRepeatButtonStyle}" />
 					</Track.DecreaseRepeatButton>
 					<Track.IncreaseRepeatButton>
-						<controls:SliderRepeatButton Height="{StaticResource WD.RepeatButtonSize}" Margin="0,2,0,0" Background="{DynamicResource WD.BaseSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" RadiusOrientation="Left" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
+						<RepeatButton Height="{StaticResource WD.RepeatButtonSize}" Margin="0,2,0,0" Background="{DynamicResource WD.BaseSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
 					</Track.IncreaseRepeatButton>
 					<Track.Thumb>
 						<Thumb Style="{StaticResource WD.SliderThumbStyle}" />
@@ -1478,10 +1462,10 @@
 				<TickBar x:Name="BottomTick" Grid.Column="2" Width="4" Margin="2,0,0,0" Fill="{TemplateBinding Foreground}" Placement="Right" Visibility="Collapsed" />
 				<Track x:Name="PART_Track" Grid.Column="1">
 					<Track.DecreaseRepeatButton>
-						<controls:SliderRepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" RadiusOrientation="Up" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
+						<RepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Command="{x:Static Slider.DecreaseLarge}" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
 					</Track.DecreaseRepeatButton>
 					<Track.IncreaseRepeatButton>
-						<controls:SliderRepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.LightSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" RadiusOrientation="Down" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
+						<RepeatButton Width="{StaticResource WD.RepeatButtonSize}" Background="{DynamicResource WD.LightSolidColorBrush}" Command="{x:Static Slider.IncreaseLarge}" Style="{StaticResource WD.SliderRepeatButtonStyle}" />
 					</Track.IncreaseRepeatButton>
 					<Track.Thumb>
 						<Thumb Style="{StaticResource WD.SliderThumbStyle}" />
@@ -1629,9 +1613,6 @@
 						<controls:SmallPanel>
 							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" FontSize="{StaticResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" Visibility="Collapsed" />
 							<ScrollViewer x:Name="PART_ContentHost" />
-							<Button x:Name="PART_CloseButton" Width="20" Height="20" Margin="0,0,4,0" HorizontalAlignment="Right" helpers:ElementHelper.IsClear="{Binding Path=(helpers:ElementHelper.IsClear), RelativeSource={RelativeSource TemplatedParent}}" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}" ToolTip="{Binding [Clear], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed">
-								<controls:PathIcon Width="10" Height="10" Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}" Kind="WindowClose" />
-							</Button>
 						</controls:SmallPanel>
 					</Border>
 					<ControlTemplate.Triggers>
@@ -1644,23 +1625,6 @@
 						<Trigger Property="IsMouseOver" Value="True">
 							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
 						</Trigger>
-						<Trigger Property="helpers:ElementHelper.IsClear" Value="True">
-							<Setter TargetName="PART_CloseButton" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="helpers:ElementHelper.IsClear" Value="True" />
-								<Condition Property="Text" Value="{x:Null}" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_CloseButton" Property="Visibility" Value="Collapsed" />
-						</MultiTrigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="helpers:ElementHelper.IsClear" Value="True" />
-								<Condition Property="Text" Value="" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_CloseButton" Property="Visibility" Value="Collapsed" />
-						</MultiTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>
@@ -2240,7 +2204,7 @@
 						</DataTemplate>
 					</ControlTemplate.Resources>
 					<controls:SmallPanel x:Name="PART_Root" Margin="{TemplateBinding Margin}">
-						<Border Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType=Calendar}}" SnapsToDevicePixels="True" UseLayoutRounding="True">
+						<Border Background="{DynamicResource WD.BackgroundSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True" UseLayoutRounding="True">
 							<Border.Effect>
 								<DropShadowEffect BlurRadius="12" Opacity="0.1" ShadowDepth="2" Color="{DynamicResource WD.BlackColor}" />
 							</Border.Effect>
@@ -2415,6 +2379,14 @@
 								<SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
 							</Polygon.Fill>
 						</Polygon>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal" />
+								<VisualState x:Name="MouseOver" />
+								<VisualState x:Name="Pressed" />
+								<VisualState x:Name="Disabled" />
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
 					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsMouseOver" Value="True">
@@ -2427,7 +2399,7 @@
 	</Style>
 	<Style x:Key="WD.DefaultDataGrid" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type DataGrid}">
 		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderThickness" Value="1,1,1,0" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="Background" Value="{x:Null}" />
 		<Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
@@ -2440,29 +2412,24 @@
 		<Setter Property="AutoGenerateColumns" Value="False" />
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="RowHeaderWidth" Value="0" />
-		<Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
-		<Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-		<Setter Property="ScrollViewer.PanningMode" Value="VerticalOnly" />
-		<Setter Property="Stylus.IsFlicksEnabled" Value="False" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type DataGrid}">
-					<controls:WDBorder x:Name="DGR_Border" Padding="0,0,0,.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
-						<ScrollViewer x:Name="DG_ScrollViewer" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" Focusable="False">
+					<Border x:Name="DGR_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+						<ScrollViewer x:Name="DG_ScrollViewer" Focusable="False">
 							<ScrollViewer.Template>
 								<ControlTemplate TargetType="{x:Type ScrollViewer}">
 									<Grid>
 										<Grid.ColumnDefinitions>
 											<ColumnDefinition Width="Auto" />
 											<ColumnDefinition Width="*" />
-											<ColumnDefinition Width="Auto" />
 										</Grid.ColumnDefinitions>
 										<Grid.RowDefinitions>
 											<RowDefinition Height="Auto" />
 											<RowDefinition Height="*" />
 											<RowDefinition Height="Auto" />
 										</Grid.RowDefinitions>
-										<Button x:Name="PART_DataGridSelectAllButton" Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid}, Converter={StaticResource WD.DoubleMinConverter}}" Command="{x:Static DataGrid.SelectAllCommand}" Focusable="False" Style="{StaticResource WD.DefaultDataGridSelectAllButtonStyle}" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
+										<Button Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid}, Converter={StaticResource WD.DoubleMinConverter}}" Command="{x:Static DataGrid.SelectAllCommand}" Focusable="False" Style="{StaticResource WD.DefaultDataGridSelectAllButtonStyle}" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.All}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
 										<DataGridColumnHeadersPresenter x:Name="PART_ColumnHeadersPresenter" Grid.Column="1" Visibility="{Binding HeadersVisibility, ConverterParameter={x:Static DataGridHeadersVisibility.Column}, Converter={x:Static DataGrid.HeadersVisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGrid}}}" />
 										<ScrollContentPresenter x:Name="PART_ScrollContentPresenter" Grid.Row="1" Grid.ColumnSpan="2" CanContentScroll="{TemplateBinding CanContentScroll}" />
 										<ScrollBar x:Name="PART_VerticalScrollBar" Grid.Row="1" Grid.Column="1" HorizontalAlignment="Right" Maximum="{TemplateBinding ScrollableHeight}" Orientation="Vertical" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{Binding VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}" />
@@ -2478,7 +2445,13 @@
 							</ScrollViewer.Template>
 							<ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 						</ScrollViewer>
-					</controls:WDBorder>
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Disabled" />
+								<VisualState x:Name="Normal" />
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
+					</Border>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -2599,7 +2572,7 @@
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type DataGridRowHeader}">
 					<controls:SmallPanel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-						<Border x:Name="DGR_Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+						<Border x:Name="rowHeaderBorder" Background="{TemplateBinding Background}">
 							<StackPanel Orientation="Horizontal">
 								<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" TextElement.FontWeight="{TemplateBinding FontWeight}" />
 								<Control SnapsToDevicePixels="false" Template="{Binding ValidationErrorTemplate, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" Visibility="{Binding (Validation.HasError), Converter={StaticResource WD.Bool2VisibilityConverter}, RelativeSource={RelativeSource AncestorType={x:Type DataGridRow}}}" />
@@ -2607,6 +2580,26 @@
 						</Border>
 						<Thumb x:Name="PART_TopHeaderGripper" VerticalAlignment="Top" Style="{StaticResource WD.RowHeaderGripperStyle}" />
 						<Thumb x:Name="PART_BottomHeaderGripper" VerticalAlignment="Bottom" Style="{StaticResource WD.RowHeaderGripperStyle}" />
+						<VisualStateManager.VisualStateGroups>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal" />
+								<VisualState x:Name="Normal_CurrentRow" />
+								<VisualState x:Name="Unfocused_EditingRow" />
+								<VisualState x:Name="Normal_EditingRow" />
+								<VisualState x:Name="MouseOver" />
+								<VisualState x:Name="MouseOver_CurrentRow" />
+								<VisualState x:Name="MouseOver_Unfocused_EditingRow" />
+								<VisualState x:Name="MouseOver_EditingRow" />
+								<VisualState x:Name="MouseOver_Unfocused_Selected" />
+								<VisualState x:Name="MouseOver_Selected" />
+								<VisualState x:Name="MouseOver_Unfocused_CurrentRow_Selected" />
+								<VisualState x:Name="MouseOver_CurrentRow_Selected" />
+								<VisualState x:Name="Unfocused_Selected" />
+								<VisualState x:Name="Unfocused_CurrentRow_Selected" />
+								<VisualState x:Name="Normal_CurrentRow_Selected" />
+								<VisualState x:Name="Normal_Selected" />
+							</VisualStateGroup>
+						</VisualStateManager.VisualStateGroups>
 					</controls:SmallPanel>
 				</ControlTemplate>
 			</Setter.Value>
@@ -2649,7 +2642,7 @@
 						</Storyboard>
 					</ControlTemplate.Resources>
 					<controls:SmallPanel>
-						<Border x:Name="DGR_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="True">
+						<Border x:Name="columnHeaderBorder" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
 							<Grid Name="HedearGrid">
 								<Grid.ColumnDefinitions>
 									<ColumnDefinition Width="*" />
@@ -2733,6 +2726,11 @@
 									</Storyboard>
 								</VisualState>
 							</VisualStateGroup>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal" />
+								<VisualState x:Name="MouseOver" />
+								<VisualState x:Name="Disabled" />
+							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 					</controls:SmallPanel>
 					<ControlTemplate.Triggers>
@@ -2776,6 +2774,11 @@
 									</Storyboard>
 								</VisualState>
 							</VisualStateGroup>
+							<VisualStateGroup x:Name="CommonStates">
+								<VisualState x:Name="Normal" />
+								<VisualState x:Name="MouseOver" />
+								<VisualState x:Name="Disabled" />
+							</VisualStateGroup>
 						</VisualStateManager.VisualStateGroups>
 					</controls:SmallPanel>
 					<ControlTemplate.Triggers>
@@ -2812,12 +2815,12 @@
 		<Setter Property="HorizontalContentAlignment" Value="Center" />
 		<Setter Property="VerticalContentAlignment" Value="Center" />
 		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+		<Setter Property="Padding" Value="2" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type TabControl}">
-					<controls:WDBorder x:Name="PART_Border" Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
-						<Grid Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}">
+					<Border Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<Grid ClipToBounds="True" KeyboardNavigation.TabNavigation="Local" SnapsToDevicePixels="True">
 							<Grid.ColumnDefinitions>
 								<ColumnDefinition Name="ColumnDefinition0" />
 								<ColumnDefinition Name="ColumnDefinition1" Width="0" />
@@ -2826,14 +2829,14 @@
 								<RowDefinition Name="RowDefinition0" Height="Auto" />
 								<RowDefinition Name="RowDefinition1" Height="*" />
 							</Grid.RowDefinitions>
-							<Border x:Name="HeaderBorder" Grid.Row="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0,0,0,1" ClipToBounds="True" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}" SnapsToDevicePixels="True">
-								<TabPanel Name="HeaderPanel" Panel.ZIndex="1" IsItemsHost="True" KeyboardNavigation.TabIndex="1" />
+							<Border x:Name="HeaderBorder" Grid.Row="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0,0,0,1">
+								<TabPanel Name="HeaderPanel" Margin="2,2,2,0" Panel.ZIndex="1" IsItemsHost="True" KeyboardNavigation.TabIndex="1" />
 							</Border>
 							<controls:SmallPanel x:Name="ContentPanel" Grid.Row="1" Grid.Column="0" KeyboardNavigation.DirectionalNavigation="Contained" KeyboardNavigation.TabIndex="2" KeyboardNavigation.TabNavigation="Local">
 								<ContentPresenter Name="PART_SelectedContentHost" Margin="{TemplateBinding Padding}" Content="{TemplateBinding SelectedContent}" ContentSource="SelectedContent" ContentStringFormat="{TemplateBinding SelectedContentStringFormat}" ContentTemplate="{TemplateBinding SelectedContentTemplate}" SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
 							</controls:SmallPanel>
 						</Grid>
-					</controls:WDBorder>
+					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="TabControl.TabStripPlacement" Value="Bottom">
 							<Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
@@ -2841,7 +2844,6 @@
 							<Setter TargetName="HeaderBorder" Property="Grid.Row" Value="1" />
 							<Setter TargetName="ContentPanel" Property="Grid.Row" Value="0" />
 							<Setter TargetName="HeaderBorder" Property="BorderThickness" Value="0,1,0,0" />
-							<Setter TargetName="HeaderBorder" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Up}" />
 							<Setter Property="ItemContainerStyle" Value="{StaticResource WD.BottomTabItem}" />
 						</Trigger>
 						<Trigger Property="TabControl.TabStripPlacement" Value="Left">
@@ -2852,7 +2854,6 @@
 							<Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
 							<Setter TargetName="RowDefinition1" Property="RowDefinition.Height" Value="0" />
 							<Setter TargetName="HeaderBorder" Property="BorderThickness" Value="0,0,1,0" />
-							<Setter TargetName="HeaderBorder" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Right}" />
 							<Setter Property="ItemContainerStyle" Value="{StaticResource WD.LeftTabItem}" />
 						</Trigger>
 						<Trigger Property="TabControl.TabStripPlacement" Value="Right">
@@ -2864,7 +2865,6 @@
 							<Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
 							<Setter TargetName="RowDefinition1" Property="RowDefinition.Height" Value="0" />
 							<Setter TargetName="HeaderBorder" Property="BorderThickness" Value="1,0,0,0" />
-							<Setter TargetName="HeaderBorder" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Left}" />
 							<Setter Property="ItemContainerStyle" Value="{StaticResource WD.RightTabItem}" />
 						</Trigger>
 					</ControlTemplate.Triggers>
@@ -2892,9 +2892,6 @@
 						<controls:SmallPanel>
 							<TextBlock x:Name="PART_Watermark" Margin="{TemplateBinding Padding}" Padding="1,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" FontSize="{TemplateBinding FontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}" TextTrimming="CharacterEllipsis" Visibility="Collapsed" />
 							<ScrollViewer x:Name="PART_ContentHost" />
-							<Button x:Name="PART_CloseButton" Width="20" Height="20" Margin="0,0,4,0" HorizontalAlignment="Right" helpers:ElementHelper.IsClear="{Binding Path=(helpers:ElementHelper.IsClear), RelativeSource={RelativeSource TemplatedParent}}" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}" ToolTip="{Binding [Clear], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed">
-								<controls:PathIcon Width="10" Height="10" Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}" Kind="WindowClose" />
-							</Button>
 						</controls:SmallPanel>
 					</Border>
 					<ControlTemplate.Triggers>
@@ -2904,16 +2901,6 @@
 						<Trigger Property="IsMouseOver" Value="True">
 							<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
 						</Trigger>
-						<Trigger Property="helpers:ElementHelper.IsClear" Value="True">
-							<Setter TargetName="PART_CloseButton" Property="Visibility" Value="Visible" />
-						</Trigger>
-						<MultiTrigger>
-							<MultiTrigger.Conditions>
-								<Condition Property="helpers:ElementHelper.IsClear" Value="True" />
-								<Condition Property="helpers:PasswordBoxHelper.PasswordLength" Value="0" />
-							</MultiTrigger.Conditions>
-							<Setter TargetName="PART_CloseButton" Property="Visibility" Value="Collapsed" />
-						</MultiTrigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>
@@ -2925,21 +2912,20 @@
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="HorizontalContentAlignment" Value="Stretch" />
 		<Setter Property="VerticalContentAlignment" Value="Stretch" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+		<Setter Property="BorderBrush" Value="{DynamicResource WD.LighterSolidColorBrush}" />
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type Expander}">
-					<Border x:Name="PART_BorderRoot" Margin="{TemplateBinding Margin}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="0" ClipToBounds="True" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
+					<Border Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
 						<DockPanel>
-							<ToggleButton x:Name="HeaderSite" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" DockPanel.Dock="Top" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
+							<ToggleButton x:Name="HeaderSite" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" Content="{TemplateBinding Header}" ContentTemplate="{TemplateBinding HeaderTemplate}" DockPanel.Dock="Top" IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
 								<ToggleButton.Style>
 									<Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-										<Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type Expander}}}" />
 										<Setter Property="Template">
 											<Setter.Value>
 												<ControlTemplate TargetType="{x:Type ToggleButton}">
-													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.ColumnDefinitions>
 																<ColumnDefinition Width="19" />
@@ -2971,18 +2957,13 @@
 															</VisualStateGroup>
 														</VisualStateManager.VisualStateGroups>
 													</Border>
-													<ControlTemplate.Triggers>
-														<Trigger Property="IsChecked" Value="True">
-															<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}" />
-														</Trigger>
-													</ControlTemplate.Triggers>
 												</ControlTemplate>
 											</Setter.Value>
 										</Setter>
 									</Style>
 								</ToggleButton.Style>
 							</ToggleButton>
-							<Border x:Name="PART_Content" DockPanel.Dock="Bottom" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True" Visibility="Collapsed">
+							<Border x:Name="PART_Content" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="0" DockPanel.Dock="Bottom" RenderTransformOrigin=".5,0" SnapsToDevicePixels="True" Visibility="Collapsed">
 								<Border.RenderTransform>
 									<ScaleTransform ScaleY="0" />
 								</Border.RenderTransform>
@@ -2993,8 +2974,6 @@
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsExpanded" Value="True">
 							<Setter TargetName="PART_Content" Property="Visibility" Value="Visible" />
-							<Setter TargetName="PART_BorderRoot" Property="BorderThickness" Value="1" />
-							<Setter TargetName="HeaderSite" Property="BorderThickness" Value="0" />
 						</Trigger>
 						<Trigger Property="ExpandDirection" Value="Right">
 							<Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Right" />
@@ -3008,11 +2987,10 @@
 							<Setter TargetName="HeaderSite" Property="Style">
 								<Setter.Value>
 									<Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-										<Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type Expander}}}" />
 										<Setter Property="Template">
 											<Setter.Value>
 												<ControlTemplate TargetType="{x:Type ToggleButton}">
-													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.RowDefinitions>
 																<RowDefinition Height="19" />
@@ -3051,11 +3029,6 @@
 															</VisualStateGroup>
 														</VisualStateManager.VisualStateGroups>
 													</Border>
-													<ControlTemplate.Triggers>
-														<Trigger Property="IsChecked" Value="True">
-															<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding (helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Right}" />
-														</Trigger>
-													</ControlTemplate.Triggers>
 												</ControlTemplate>
 											</Setter.Value>
 										</Setter>
@@ -3070,11 +3043,10 @@
 							<Setter TargetName="HeaderSite" Property="Style">
 								<Setter.Value>
 									<Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-										<Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type Expander}}}" />
 										<Setter Property="Template">
 											<Setter.Value>
 												<ControlTemplate TargetType="{x:Type ToggleButton}">
-													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.ColumnDefinitions>
 																<ColumnDefinition Width="19" />
@@ -3108,11 +3080,6 @@
 															</VisualStateGroup>
 														</VisualStateManager.VisualStateGroups>
 													</Border>
-													<ControlTemplate.Triggers>
-														<Trigger Property="IsChecked" Value="True">
-															<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Up}" />
-														</Trigger>
-													</ControlTemplate.Triggers>
 												</ControlTemplate>
 											</Setter.Value>
 										</Setter>
@@ -3132,11 +3099,10 @@
 							<Setter TargetName="HeaderSite" Property="Style">
 								<Setter.Value>
 									<Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-										<Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type Expander}}}" />
 										<Setter Property="Template">
 											<Setter.Value>
 												<ControlTemplate TargetType="{x:Type ToggleButton}">
-													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+													<Border x:Name="PART_Border" Background="{DynamicResource WD.LighterSolidColorBrush}" BorderBrush="{DynamicResource WD.BaseSolidColorBrush}" BorderThickness="1">
 														<Grid Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}" Background="Transparent" SnapsToDevicePixels="False">
 															<Grid.RowDefinitions>
 																<RowDefinition Height="19" />
@@ -3175,11 +3141,6 @@
 															</VisualStateGroup>
 														</VisualStateManager.VisualStateGroups>
 													</Border>
-													<ControlTemplate.Triggers>
-														<Trigger Property="IsChecked" Value="True">
-															<Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Left}" />
-														</Trigger>
-													</ControlTemplate.Triggers>
 												</ControlTemplate>
 											</Setter.Value>
 										</Setter>
@@ -3193,7 +3154,6 @@
 								<Condition Property="ExpandDirection" Value="Down" />
 							</MultiTrigger.Conditions>
 							<Setter TargetName="PART_Content" Property="BorderThickness" Value="1,0,1,1" />
-							<Setter TargetName="HeaderSite" Property="BorderThickness" Value="0,0,0,1" />
 							<MultiTrigger.EnterActions>
 								<BeginStoryboard x:Name="PART_DownBeginStoryboard">
 									<Storyboard>
@@ -3211,7 +3171,6 @@
 								<Condition Property="ExpandDirection" Value="Right" />
 							</MultiTrigger.Conditions>
 							<Setter TargetName="PART_Content" Property="BorderThickness" Value="0,1,1,1" />
-							<Setter TargetName="HeaderSite" Property="BorderThickness" Value="0,0,1,0" />
 							<MultiTrigger.EnterActions>
 								<BeginStoryboard x:Name="PART_RightBeginStoryboard">
 									<Storyboard>
@@ -3229,7 +3188,6 @@
 								<Condition Property="ExpandDirection" Value="Up" />
 							</MultiTrigger.Conditions>
 							<Setter TargetName="PART_Content" Property="BorderThickness" Value="1,1,1,0" />
-							<Setter TargetName="HeaderSite" Property="BorderThickness" Value="0,1,0,0" />
 							<MultiTrigger.EnterActions>
 								<BeginStoryboard x:Name="PART_UpBeginStoryboard">
 									<Storyboard>
@@ -3247,7 +3205,6 @@
 								<Condition Property="ExpandDirection" Value="Left" />
 							</MultiTrigger.Conditions>
 							<Setter TargetName="PART_Content" Property="BorderThickness" Value="1,1,0,1" />
-							<Setter TargetName="HeaderSite" Property="BorderThickness" Value="1,0,0,0" />
 							<MultiTrigger.EnterActions>
 								<BeginStoryboard x:Name="PART_LeftBeginStoryboard">
 									<Storyboard>
@@ -3269,19 +3226,18 @@
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Background" Value="{DynamicResource WD.LighterSolidColorBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type GroupBox}">
-					<Grid Margin="{TemplateBinding Margin}">
+					<Grid>
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
 							<RowDefinition Height="*" />
 						</Grid.RowDefinitions>
-						<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}" SnapsToDevicePixels="True">
+						<Border Grid.Row="0" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1">
 							<ContentPresenter Margin="{TemplateBinding Padding}" VerticalAlignment="Center" ContentSource="Header" RecognizesAccessKey="True" />
 						</Border>
-						<Border Grid.Row="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,0,1,1" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Up}" SnapsToDevicePixels="True">
+						<Border Grid.Row="1" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1,0,1,1" SnapsToDevicePixels="True">
 							<ContentPresenter Margin="{TemplateBinding Padding}" />
 						</Border>
 					</Grid>
@@ -3295,16 +3251,16 @@
 		<Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
 		<Setter Property="ScrollViewer.CanContentScroll" Value="True" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
+		<Setter Property="BorderThickness" Value="0,1,0,0" />
 		<Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ListBox}">
-					<controls:WDBorder x:Name="Border" Margin="{TemplateBinding Margin}" Padding="0,0,0,.1" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
-						<ScrollViewer Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" Focusable="False">
+					<Border Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<ScrollViewer Focusable="False">
 							<VirtualizingStackPanel IsItemsHost="True" />
 						</ScrollViewer>
-					</controls:WDBorder>
+					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="IsGrouping" Value="True">
 							<Setter Property="ScrollViewer.CanContentScroll" Value="False" />
@@ -3359,16 +3315,20 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ScrollViewer}">
-					<controls:SmallPanel>
+					<Grid Background="{TemplateBinding Background}">
+						<Grid.RowDefinitions>
+							<RowDefinition Height="*" />
+							<RowDefinition Height="Auto" />
+						</Grid.RowDefinitions>
 						<DockPanel Margin="{TemplateBinding Padding}">
 							<ScrollViewer DockPanel.Dock="Top" Focusable="False" HorizontalScrollBarVisibility="Hidden" VerticalScrollBarVisibility="Hidden">
 								<GridViewHeaderRowPresenter AllowsColumnReorder="{Binding Path=TemplatedParent.View.AllowsColumnReorder, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContainerStyle="{Binding Path=TemplatedParent.View.ColumnHeaderContainerStyle, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderContextMenu="{Binding Path=TemplatedParent.View.ColumnHeaderContextMenu, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderTemplate="{Binding Path=TemplatedParent.View.ColumnHeaderTemplate, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderTemplateSelector="{Binding Path=TemplatedParent.View.ColumnHeaderTemplateSelector, RelativeSource={RelativeSource TemplatedParent}}" ColumnHeaderToolTip="{Binding Path=TemplatedParent.View.ColumnHeaderToolTip, RelativeSource={RelativeSource TemplatedParent}}" Columns="{Binding Path=TemplatedParent.View.Columns, RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
 							</ScrollViewer>
 							<ScrollContentPresenter Name="PART_ScrollContentPresenter" CanContentScroll="True" CanHorizontallyScroll="False" CanVerticallyScroll="False" KeyboardNavigation.DirectionalNavigation="Local" />
 						</DockPanel>
-						<ScrollBar Name="PART_HorizontalScrollBar" VerticalAlignment="Bottom" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{TemplateBinding HorizontalOffset}" />
+						<ScrollBar Name="PART_HorizontalScrollBar" Grid.Row="1" Maximum="{TemplateBinding ScrollableWidth}" Orientation="Horizontal" ViewportSize="{TemplateBinding ViewportWidth}" Visibility="{TemplateBinding ComputedHorizontalScrollBarVisibility}" Value="{TemplateBinding HorizontalOffset}" />
 						<ScrollBar Name="PART_VerticalScrollBar" HorizontalAlignment="Right" Maximum="{TemplateBinding ScrollableHeight}" ViewportSize="{TemplateBinding ViewportHeight}" Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}" Value="{TemplateBinding VerticalOffset}" />
-					</controls:SmallPanel>
+					</Grid>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -3431,24 +3391,8 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="{x:Type ListView}">
-					<Border Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
+					<Border Name="Border" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
 						<ScrollViewer Style="{StaticResource WD.GridViewScrollViewerStyleKey}">
-							<ScrollViewer.Clip>
-								<RectangleGeometry>
-									<RectangleGeometry.RadiusX>
-										<Binding ElementName="Border" Path="CornerRadius.TopLeft" />
-									</RectangleGeometry.RadiusX>
-									<RectangleGeometry.RadiusY>
-										<Binding ElementName="Border" Path="CornerRadius.TopLeft" />
-									</RectangleGeometry.RadiusY>
-									<RectangleGeometry.Rect>
-										<MultiBinding Converter="{StaticResource WD.WidthHeightToRectConverter}">
-											<Binding Path="ActualWidth" RelativeSource="{RelativeSource AncestorType=ScrollViewer}" />
-											<Binding Path="ActualHeight" RelativeSource="{RelativeSource AncestorType=ScrollViewer}" />
-										</MultiBinding>
-									</RectangleGeometry.Rect>
-								</RectangleGeometry>
-							</ScrollViewer.Clip>
 							<ItemsPresenter />
 						</ScrollViewer>
 					</Border>
@@ -3513,12 +3457,12 @@
 							</PointAnimationUsingKeyFrames>
 						</Storyboard>
 					</ControlTemplate.Resources>
-					<controls:WDBorder x:Name="PART_TemplateRoot" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+					<Border x:Name="PART_TemplateRoot">
 						<controls:SmallPanel ClipToBounds="True" SnapsToDevicePixels="True">
-							<Border x:Name="PART_Border" Background="{DynamicResource WD.BaseSolidColorBrush}" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
+							<Border x:Name="PART_Border" Background="{DynamicResource WD.BaseSolidColorBrush}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
 							<Rectangle x:Name="PART_Track" />
 							<Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
-								<Border x:Name="Indicator" Background="{TemplateBinding Foreground}" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
+								<Border x:Name="Indicator" Background="{TemplateBinding Foreground}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
 							</Decorator>
 							<Rectangle x:Name="PART_Rectangle" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Visibility="Collapsed">
 								<Rectangle.RenderTransform>
@@ -3526,7 +3470,7 @@
 								</Rectangle.RenderTransform>
 							</Rectangle>
 						</controls:SmallPanel>
-					</controls:WDBorder>
+					</Border>
 					<ControlTemplate.Triggers>
 						<Trigger Property="Orientation" Value="Vertical">
 							<Setter Property="Height" Value="{x:Static sys:Double.NaN}" />
@@ -3542,6 +3486,7 @@
 							</Trigger.EnterActions>
 							<Setter TargetName="PART_Indicator" Property="Visibility" Value="Collapsed" />
 							<Setter TargetName="PART_Rectangle" Property="Visibility" Value="Visible" />
+							<Setter TargetName="PART_Border" Property="CornerRadius" Value="0" />
 							<Trigger.ExitActions>
 								<StopStoryboard BeginStoryboardName="IndeterminateStoryboard" />
 							</Trigger.ExitActions>
@@ -3601,11 +3546,11 @@
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="TreeView">
-					<controls:WDBorder Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" SnapsToDevicePixels="True">
-						<ScrollViewer CanContentScroll="False" Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" Focusable="False">
+					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
+						<ScrollViewer Padding="{TemplateBinding Padding}" CanContentScroll="False" Focusable="False">
 							<ItemsPresenter />
 						</ScrollViewer>
-					</controls:WDBorder>
+					</Border>
 				</ControlTemplate>
 			</Setter.Value>
 		</Setter>
@@ -3729,7 +3674,7 @@
 	</Style>
 	<Style BasedOn="{StaticResource WD.DefaultTreeView}" TargetType="{x:Type TreeView}" />
 	<Style BasedOn="{StaticResource WD.DefaultTreeViewItem}" TargetType="{x:Type TreeViewItem}" />
-	<Style x:Key="WD.WDMessageBox" TargetType="{x:Type controls:WDMessageBox}">
+	<Style x:Key="WD.WPFMessageBox" TargetType="{x:Type controls:WPFMessageBox}">
 		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
@@ -3744,7 +3689,7 @@
 		<Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:WDMessageBox}">
+				<ControlTemplate TargetType="{x:Type controls:WPFMessageBox}">
 					<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}">
 						<Grid>
 							<Grid.RowDefinitions>
@@ -3755,7 +3700,7 @@
 							<controls:SmallPanel Grid.Row="0">
 								<DockPanel Margin="20,0,0,0">
 									<TextBlock x:Name="PART_Title" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="{StaticResource WD.TitleFontSize}" Foreground="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-									<Button Name="PART_CloseButton" Margin="0,6" HorizontalAlignment="Right" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}" ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
+									<Button Name="PART_CloseButton" Margin="0,6" HorizontalAlignment="Right" IsTabStop="False" Style="{DynamicResource WD.WindowButtonStyle}">
 										<Path Width="10" Height="10" HorizontalAlignment="Center" VerticalAlignment="Center" Data="{StaticResource WD.WindowCloseGeometry}" Fill="{DynamicResource WD.PrimaryTextSolidColorBrush}" Stretch="Fill" />
 									</Button>
 								</DockPanel>
@@ -3766,12 +3711,10 @@
 									<TextBox x:Name="PART_Message" Width="Auto" MaxWidth="500" Padding="10,0" VerticalAlignment="Center" BorderThickness="0" FontSize="{DynamicResource WD.NormalFontSize}" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" IsReadOnly="True" TextWrapping="Wrap" />
 								</DockPanel>
 							</controls:SmallPanel>
-							<controls:SmallPanel Grid.Row="2" Margin="140,20,10,10" HorizontalAlignment="Right">
+							<controls:SmallPanel Grid.Row="2" Margin="140,20,10,10">
 								<UniformGrid Height="38" Rows="1">
-									<Button x:Name="PART_ButtonYes" Width="60" Content="{Binding [Yes], Source={x:Static resx:LanguageManager.Instance}}" Style="{DynamicResource WD.PrimaryButton}" Visibility="Collapsed" />
-									<Button x:Name="PART_ButtonNo" Width="60" Margin="6,0,0,0" Content="{Binding [No], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed" />
-									<Button x:Name="PART_ButtonOK" Width="60" Margin="6,0,0,0" Content="{Binding [OK], Source={x:Static resx:LanguageManager.Instance}}" Style="{DynamicResource WD.PrimaryButton}" />
-									<Button x:Name="PART_ButtonCancel" Width="60" Margin="6,0,0,0" Content="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed" />
+									<Button x:Name="PART_ButtonCancel" Width="60" Content="取消" Visibility="Collapsed" />
+									<Button x:Name="PART_ButtonOK" Width="60" Margin="6,0,0,0" Content="确认" Style="{DynamicResource WD.PrimaryButton}" />
 								</UniformGrid>
 							</controls:SmallPanel>
 						</Grid>
@@ -3780,13 +3723,13 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style BasedOn="{StaticResource WD.WDMessageBox}" TargetType="{x:Type controls:WDMessageBox}" />
-	<Style x:Key="WD.NormalLoading" TargetType="{x:Type controls:NormalLoading}">
+	<Style BasedOn="{StaticResource WD.WPFMessageBox}" TargetType="{x:Type controls:WPFMessageBox}" />
+	<Style x:Key="WD.DefaultLoading" TargetType="{x:Type controls:DefaultLoading}">
 		<Setter Property="Width" Value="40" />
 		<Setter Property="Height" Value="40" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:NormalLoading}">
+				<ControlTemplate TargetType="{x:Type controls:DefaultLoading}">
 					<Viewbox Width="{TemplateBinding Width}" Height="{TemplateBinding Height}">
 						<controls:SmallPanel>
 							<controls:SmallPanel.Resources>
@@ -3814,18 +3757,20 @@
 			</Setter.Value>
 		</Setter>
 	</Style>
-	<Style x:Key="WD.DefaultLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:DefaultLoading}">
+	<Style x:Key="WD.NormalLoading" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:NormalLoading}">
 		<Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
 		<Setter Property="Height" Value="40" />
 		<Setter Property="Width" Value="40" />
 		<Setter Property="ArcThickness" Value="2" />
 		<Setter Property="Template">
 			<Setter.Value>
-				<ControlTemplate TargetType="{x:Type controls:DefaultLoading}">
+				<ControlTemplate TargetType="{x:Type controls:NormalLoading}">
 					<ControlTemplate.Resources>
 						<Storyboard x:Key="WD.PlayStoryboard" RepeatBehavior="Forever">
-							<DoubleAnimation RepeatBehavior="Forever" Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)" To="360" Duration="0:0:0.784" />
-							<DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetName="PART_Arc" Storyboard.TargetProperty="(UIElement.RenderTransform).(RotateTransform.Angle)">
+							<DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetName="PART_SmallPanel" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)">
+								<LinearDoubleKeyFrame KeyTime="0:0:0.784" Value="360" />
+							</DoubleAnimationUsingKeyFrames>
+							<DoubleAnimationUsingKeyFrames RepeatBehavior="Forever" Storyboard.TargetName="PART_Arc" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(RotateTransform.Angle)">
 								<SplineDoubleKeyFrame KeyTime="0" Value="0" />
 								<SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:0.666" Value="135" />
 								<SplineDoubleKeyFrame KeySpline="0.4,0.0,0.2,1" KeyTime="0:0:1.333" Value="270" />
@@ -3850,18 +3795,24 @@
 					</ControlTemplate.Resources>
 					<controls:SmallPanel x:Name="PART_SmallPanel" RenderTransformOrigin=".5,.5">
 						<controls:SmallPanel.RenderTransform>
-							<RotateTransform />
+							<TransformGroup>
+								<RotateTransform />
+							</TransformGroup>
 						</controls:SmallPanel.RenderTransform>
 						<shapes:Arc x:Name="PART_Arc" Width="{TemplateBinding ActualWidth}" Height="{TemplateBinding ActualHeight}" ArcThickness="{TemplateBinding ArcThickness}" EndAngle="5" Fill="{TemplateBinding BorderBrush}" RenderTransformOrigin=".5,.5" StartAngle="-5" Stretch="None" StrokeThickness="0">
 							<shapes:Arc.RenderTransform>
-								<RotateTransform />
+								<TransformGroup>
+									<RotateTransform />
+								</TransformGroup>
 							</shapes:Arc.RenderTransform>
 						</shapes:Arc>
 					</controls:SmallPanel>
 					<ControlTemplate.Triggers>
-						<EventTrigger RoutedEvent="Loaded">
-							<BeginStoryboard Storyboard="{StaticResource WD.PlayStoryboard}" />
-						</EventTrigger>
+						<Trigger Property="IsIndeterminate" Value="True">
+							<Trigger.EnterActions>
+								<BeginStoryboard Storyboard="{StaticResource WD.PlayStoryboard}" />
+							</Trigger.EnterActions>
+						</Trigger>
 					</ControlTemplate.Triggers>
 				</ControlTemplate>
 			</Setter.Value>
@@ -5141,6 +5092,99 @@
 	<Style BasedOn="{StaticResource WD.CycleLoading}" TargetType="{x:Type controls:CycleLoading}" />
 	<Style BasedOn="{StaticResource WD.RollLoading}" TargetType="{x:Type controls:RollLoading}" />
 	<Style BasedOn="{StaticResource WD.RingLoading}" TargetType="{x:Type controls:RingLoading}" />
+	<ControlTemplate x:Key="WD.NavigateMenuLeft" TargetType="{x:Type controls:NavigateMenu}">
+		<controls:SmallPanel ClipToBounds="True">
+			<ListBox x:Name="PART_ListBox" Background="Transparent" BorderThickness="0" ItemsSource="{TemplateBinding ItemsSource}" ScrollViewer.VerticalScrollBarVisibility="Hidden" SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource AncestorType={x:Type controls:NavigateMenu}}}" SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource AncestorType={x:Type controls:NavigateMenu}}}">
+				<ListBox.ItemTemplate>
+					<DataTemplate>
+						<TextBlock Text="{Binding Content}" TextTrimming="CharacterEllipsis" />
+					</DataTemplate>
+				</ListBox.ItemTemplate>
+				<ListBox.ItemContainerStyle>
+					<Style BasedOn="{x:Null}" TargetType="ListBoxItem">
+						<Setter Property="VerticalContentAlignment" Value="Center" />
+						<Setter Property="Padding" Value="10,8" />
+						<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+						<Setter Property="Template">
+							<Setter.Value>
+								<ControlTemplate TargetType="{x:Type ListBoxItem}">
+									<Border x:Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+										<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+									</Border>
+									<ControlTemplate.Triggers>
+										<Trigger Property="IsSelected" Value="True">
+											<Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+											<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
+										</Trigger>
+										<Trigger Property="IsMouseOver" Value="True">
+											<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
+										</Trigger>
+									</ControlTemplate.Triggers>
+								</ControlTemplate>
+							</Setter.Value>
+						</Setter>
+					</Style>
+				</ListBox.ItemContainerStyle>
+			</ListBox>
+			<Rectangle x:Name="PART_RectangleSlider" Width="3" Height="{TemplateBinding Height}" HorizontalAlignment="Right" Fill="{DynamicResource WD.LighterSolidColorBrush}" />
+			<Rectangle Width="3" Height="35" HorizontalAlignment="Right" VerticalAlignment="Top" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}">
+				<Rectangle.RenderTransform>
+					<TranslateTransform x:Name="PART_TranslateTransform" />
+				</Rectangle.RenderTransform>
+			</Rectangle>
+		</controls:SmallPanel>
+	</ControlTemplate>
+	<Style x:Key="WD.NavigateMenuItem" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListBoxItem}">
+		<Setter Property="VerticalContentAlignment" Value="Center" />
+		<Setter Property="Padding" Value="10,8" />
+		<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+		<Setter Property="Template">
+			<Setter.Value>
+				<ControlTemplate TargetType="{x:Type ListBoxItem}">
+					<Border x:Name="PART_Border" Padding="{TemplateBinding Padding}" Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true">
+						<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+					</Border>
+					<ControlTemplate.Triggers>
+						<Trigger Property="IsSelected" Value="True">
+							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
+						</Trigger>
+						<Trigger Property="IsMouseOver" Value="True">
+							<Setter Property="Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
+						</Trigger>
+					</ControlTemplate.Triggers>
+				</ControlTemplate>
+			</Setter.Value>
+		</Setter>
+	</Style>
+	<ControlTemplate x:Key="WD.NavigateMenuTop" TargetType="{x:Type controls:NavigateMenu}">
+		<Grid>
+			<Rectangle x:Name="PART_RectangleSlider" Width="{TemplateBinding Width}" Height="3" VerticalAlignment="Bottom" Fill="{DynamicResource WD.LighterSolidColorBrush}" />
+			<Rectangle Width="{TemplateBinding RectangleSelectWidth}" Height="3" HorizontalAlignment="Left" VerticalAlignment="Bottom" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}">
+				<Rectangle.RenderTransform>
+					<TranslateTransform x:Name="PART_TranslateTransform" />
+				</Rectangle.RenderTransform>
+			</Rectangle>
+			<ItemsPresenter />
+		</Grid>
+	</ControlTemplate>
+	<Style x:Key="WD.NavigateMenu" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:NavigateMenu}">
+		<Style.Triggers>
+			<Trigger Property="TabStripPlacement" Value="Left">
+				<Setter Property="Template" Value="{StaticResource WD.NavigateMenuLeft}" />
+			</Trigger>
+			<Trigger Property="TabStripPlacement" Value="Top">
+				<Setter Property="ItemsPanel">
+					<Setter.Value>
+						<ItemsPanelTemplate>
+							<VirtualizingStackPanel Orientation="Horizontal" />
+						</ItemsPanelTemplate>
+					</Setter.Value>
+				</Setter>
+				<Setter Property="Template" Value="{StaticResource WD.NavigateMenuTop}" />
+			</Trigger>
+		</Style.Triggers>
+	</Style>
+	<Style BasedOn="{StaticResource WD.NavigateMenu}" TargetType="{x:Type controls:NavigateMenu}" />
 	<Style x:Key="WD.PageListBoxStyleKey" BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ListBox}">
 		<Setter Property="Background" Value="Transparent" />
 		<Setter Property="BorderThickness" Value="0" />
@@ -5234,29 +5278,29 @@
 							<Border x:Name="PART_Border" Background="Transparent" BorderBrush="{DynamicResource WD.PrimaryNormalSolidColorBrush}" BorderThickness="2" Cursor="SizeAll" />
 							<Border x:Name="PART_EditBar" Panel.ZIndex="99" Background="{DynamicResource WD.BackgroundSolidColorBrush}" Effect="{StaticResource WD.PopupShadowDepth}" Visibility="Hidden">
 								<WrapPanel Margin="10,5" VerticalAlignment="Center">
-									<RadioButton x:Name="PART_RadioButtonRectangle" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Rectangle], Source={x:Static resx:LanguageManager.Instance}}">
+									<RadioButton x:Name="PART_RadioButtonRectangle" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="方框">
 										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Rectangle" />
 									</RadioButton>
-									<RadioButton x:Name="PART_RadioButtonEllipse" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Ellipse], Source={x:Static resx:LanguageManager.Instance}}">
+									<RadioButton x:Name="PART_RadioButtonEllipse" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="椭圆">
 										<Ellipse Width="19" Height="19" SnapsToDevicePixels="True" Stroke="{DynamicResource WD.RegularTextSolidColorBrush}" StrokeThickness="1.5" UseLayoutRounding="True" />
 									</RadioButton>
-									<RadioButton x:Name="PART_RadioButtonArrow" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Arrow], Source={x:Static resx:LanguageManager.Instance}}">
+									<RadioButton x:Name="PART_RadioButtonArrow" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="箭头">
 										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="ArrowRightTop" />
 									</RadioButton>
-									<RadioButton x:Name="PART_RadioButtonInk" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Ink], Source={x:Static resx:LanguageManager.Instance}}">
+									<RadioButton x:Name="PART_RadioButtonInk" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="画笔">
 										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Ink" />
 									</RadioButton>
-									<RadioButton x:Name="PART_RadioButtonText" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="{Binding [Text], Source={x:Static resx:LanguageManager.Instance}}">
+									<RadioButton x:Name="PART_RadioButtonText" Margin="4,0" Style="{DynamicResource WD.PathRadioButton}" ToolTip="文字">
 										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Text" />
 									</RadioButton>
 									<Rectangle Width="1" Height="18" Margin="4,0" Stroke="{DynamicResource WD.SecondaryTextSolidColorBrush}" />
-									<Button x:Name="PART_ButtonSave" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="{Binding [Save], Source={x:Static resx:LanguageManager.Instance}}">
+									<Button x:Name="PART_ButtonSave" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="保存">
 										<controls:PathIcon Width="18" Height="18" Foreground="{DynamicResource WD.RegularTextSolidColorBrush}" Kind="Save" />
 									</Button>
-									<Button x:Name="PART_ButtonCancel" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}">
+									<Button x:Name="PART_ButtonCancel" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="取消">
 										<controls:PathIcon Width="14" Height="14" Foreground="{StaticResource WD.DangerSolidColorBrush}" Kind="Cancel" />
 									</Button>
-									<Button x:Name="PART_ButtonComplete" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="{Binding [Complete], Source={x:Static resx:LanguageManager.Instance}}">
+									<Button x:Name="PART_ButtonComplete" Margin="4,0" Style="{DynamicResource WD.PathButton}" ToolTip="完成">
 										<controls:PathIcon Width="20" Height="15" Foreground="{StaticResource WD.SuccessSolidColorBrush}" Kind="Complete" />
 									</Button>
 								</WrapPanel>
@@ -5369,9 +5413,6 @@
 							<Setter TargetName="Border" Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
 							<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
 						</Trigger>
-						<Trigger Property="IsMouseOver" Value="True">
-							<Setter TargetName="Border" Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-						</Trigger>
 						<Trigger Property="IsEnabled" Value="False">
 							<Setter TargetName="Border" Property="Background" Value="Transparent" />
 							<Setter TargetName="Border" Property="BorderBrush" Value="Transparent" />
@@ -5441,14 +5482,12 @@
 		<Setter Property="MenuIconColor" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
 		<Setter Property="SelectionIndicatorColor" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
 		<Setter Property="MenuItemForeground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-		<Setter Property="BorderThickness" Value="1" />
-		<Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
 		<Setter Property="SelectedIndex" Value="0" />
 		<Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
 		<Setter Property="Template">
 			<Setter.Value>
 				<ControlTemplate TargetType="controls:DrawerMenu">
-					<Grid>
+					<Grid Background="{TemplateBinding Background}">
 						<Grid.RowDefinitions>
 							<RowDefinition Height="Auto" />
 							<RowDefinition />
@@ -5506,10 +5545,10 @@
 							</Path.Data>
 						</Path>
 						<controls:SmallPanel x:Name="PART_Grid" Width="200" Height="200">
-							<Button x:Name="PART_ReplaceButton" Width="40" Height="40" HorizontalAlignment="Right" VerticalAlignment="Top" Style="{StaticResource WD.PathButton}" ToolTip="{Binding [Replace], Source={x:Static resx:LanguageManager.Instance}}" Visibility="Collapsed">
+							<Button x:Name="PART_ReplaceButton" Width="40" Height="40" HorizontalAlignment="Right" VerticalAlignment="Top" Style="{StaticResource WD.PathButton}" Visibility="Collapsed">
 								<controls:PathIcon Width="15" Height="15" Foreground="{StaticResource WD.PrimaryNormalSolidColorBrush}" Kind="Replace" />
 							</Button>
-							<Button x:Name="PART_AddButton" Width="40" Height="40" Style="{StaticResource WD.PathButton}" ToolTip="{Binding [Select], Source={x:Static resx:LanguageManager.Instance}}">
+							<Button x:Name="PART_AddButton" Width="40" Height="40" Style="{StaticResource WD.PathButton}">
 								<controls:PathIcon Width="20" Height="20" Foreground="{StaticResource WD.PrimaryNormalSolidColorBrush}" Kind="Add" />
 							</Button>
 						</controls:SmallPanel>
@@ -5995,7 +6034,7 @@
 						<Rectangle x:Name="PART_RectangleTop" Style="{DynamicResource WD.ScreenCutRectangleStyle}" />
 						<Rectangle x:Name="PART_RectangleRight" Style="{DynamicResource WD.ScreenCutRectangleStyle}" />
 						<Rectangle x:Name="PART_RectangleBottom" Style="{DynamicResource WD.ScreenCutRectangleStyle}" />
-						<Border x:Name="PART_Border" Background="Transparent" BorderBrush="{DynamicResource WD.PrimaryNormalSolidColorBrush}" BorderThickness="2" Cursor="SizeAll" Visibility="Collapsed" />
+						<Border x:Name="PART_Border" Background="Transparent" BorderBrush="{DynamicResource WD.PrimaryNormalSolidColorBrush}" BorderThickness="2" Cursor="SizeAll" />
 					</Canvas>
 				</ControlTemplate>
 			</Setter.Value>
@@ -6041,7 +6080,7 @@
 									<Path x:Name="PART_Path" Width="15" Height="15" Data="{StaticResource WD.InformationGeometry}" Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}" Stretch="Fill" />
 									<TextBlock Grid.Column="1" Margin="5,0,0,0" VerticalAlignment="Center" FontSize="{TemplateBinding FontSize}" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Content}" TextWrapping="Wrap" />
 								</DockPanel>
-								<Button x:Name="PART_CloseButton" Grid.Column="2" Width="25" Height="25" Margin="0,2,4,0" HorizontalAlignment="Right" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}" ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
+								<Button x:Name="PART_CloseButton" Grid.Column="2" Width="25" Height="25" Margin="0,2,4,0" HorizontalAlignment="Right" helpers:ElementHelper.IsRound="True" Style="{StaticResource WD.NormalButton}" ToolTip="关闭">
 									<controls:PathIcon Width="10" Height="10" Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}" Kind="WindowClose" />
 								</Button>
 							</Grid>
@@ -6615,17 +6654,9 @@
 					<ColumnDefinition Width="5" />
 					<ColumnDefinition Width="Auto" />
 				</Grid.ColumnDefinitions>
-				<WrapPanel VerticalAlignment="Center">
-					<TextBlock Text="{Binding [Total], Source={x:Static resx:LanguageManager.Instance}}" />
-					<TextBlock Text="{Binding Count, StringFormat=' {0} ', RelativeSource={RelativeSource TemplatedParent}}" />
-					<TextBlock Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
-				</WrapPanel>
+				<TextBlock VerticalAlignment="Center" Text="{Binding Count, StringFormat=共 {0} 条, RelativeSource={RelativeSource TemplatedParent}}" />
 				<controls:NumericBox x:Name="PART_CountPerPageNumericBox" Grid.Column="2" Width="32" VerticalContentAlignment="Center" Maximum="100000" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0" />
-				<WrapPanel Grid.Column="3" Margin="3,0,0,0" VerticalAlignment="Center">
-					<TextBlock Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
-					<TextBlock Text=" /  " />
-					<TextBlock Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
-				</WrapPanel>
+				<TextBlock Grid.Column="3" VerticalAlignment="Center" Text=" 条 / 页" />
 				<Button Grid.Column="5" Width="32" Command="{x:Static controls:Pagination.PrevCommand}">
 					<controls:PathIcon Kind="Previous" Style="{StaticResource WD.MiniPathIcon}" />
 				</Button>
@@ -6661,15 +6692,11 @@
 								<ColumnDefinition Width="Auto" />
 								<ColumnDefinition Width="Auto" />
 							</Grid.ColumnDefinitions>
-							<WrapPanel Margin="0,0,15,0" VerticalAlignment="Center">
-								<TextBlock Text="{Binding [Total], Source={x:Static resx:LanguageManager.Instance}}" />
-								<TextBlock Text="{Binding Count, StringFormat=' {0} ', RelativeSource={RelativeSource TemplatedParent}}" />
-								<TextBlock Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
-							</WrapPanel>
+							<TextBlock Margin="0,0,15,0" VerticalAlignment="Center" Text="{Binding Count, StringFormat=共 {0} 条, RelativeSource={RelativeSource TemplatedParent}}" />
 							<StackPanel Grid.Column="1" Margin="0,0,15,0" Orientation="Horizontal">
-								<TextBlock Margin="0,0,3,0" VerticalAlignment="Center" Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
+								<TextBlock VerticalAlignment="Center" Text="每页 " />
 								<controls:NumericBox x:Name="PART_CountPerPageNumericBox" Grid.Column="2" Width="32" VerticalContentAlignment="Center" FontSize="{TemplateBinding FontSize}" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0" />
-								<TextBlock Margin="3,0,0,0" VerticalAlignment="Center" Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
+								<TextBlock VerticalAlignment="Center" Text=" 条" />
 							</StackPanel>
 							<Button Grid.Column="2" Width="32" Command="{x:Static controls:Pagination.PrevCommand}">
 								<controls:PathIcon Kind="Previous" Style="{StaticResource WD.MiniPathIcon}" />
@@ -6685,9 +6712,9 @@
 								<controls:PathIcon Kind="Next" Style="{StaticResource WD.MiniPathIcon}" />
 							</Button>
 							<StackPanel Grid.Column="5" Orientation="Horizontal">
-								<TextBlock Margin="3,0" VerticalAlignment="Center" Text="{Binding [Goto], Source={x:Static resx:LanguageManager.Instance}}" />
+								<TextBlock VerticalAlignment="Center" Text=" 前往 " />
 								<controls:NumericBox x:Name="PART_JumpPageNumericBox" Width="32" VerticalContentAlignment="Center" FontSize="{TemplateBinding FontSize}" Minimum="1" TextAlignment="Center" UpDownButtonsWidth="0" />
-								<TextBlock Margin="3,0,0,0" VerticalAlignment="Center" Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
+								<TextBlock VerticalAlignment="Center" Text=" 页" />
 							</StackPanel>
 						</Grid>
 					</Border>
diff --git a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
index a88a6a9b..4a1256a3 100644
--- a/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
+++ b/src/WPFDevelopers.Net45x/WPFDevelopers.Net45x.csproj
@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
-	<Import Project="../TargetFrameworks.props" />
-	<Import Project="../Package.props" />
+	<Import Project="../TargetFrameworks.props"/>
+	<Import Project="../Package.props"/>
 	<PropertyGroup>
 		<UseWindowsForms>true</UseWindowsForms>
-		<SignAssembly>True</SignAssembly>
-		<AssemblyOriginatorKeyFile>E:\Code\git\WPFDevelopers\WPFDevelopersMultiple\WPFDevelopers.snk</AssemblyOriginatorKeyFile>
+		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 	</PropertyGroup>
 	<Import Project="..\WPFDevelopers.Shared\WPFDevelopers.Shared.projitems" Label="Shared" />
 	<Import Project="..\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems" Label="Shared" />
diff --git a/src/WPFDevelopers.Samples.Shared/App.xaml b/src/WPFDevelopers.Samples.Shared/App.xaml
index 39a3bf78..a4eba48e 100644
--- a/src/WPFDevelopers.Samples.Shared/App.xaml
+++ b/src/WPFDevelopers.Samples.Shared/App.xaml
@@ -29,8 +29,6 @@
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/SnowCanvas/SnowCanvas.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/CropControl/CropControl.xaml" />
                 <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/TransformLayout/TransformLayout.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/ExampleViews/DrapView/Controls/TransformThumb.xaml" />
-                <ResourceDictionary Source="pack://application:,,,/WPFDevelopers.Samples;component/Controls/NavigateMenu/NavigateMenu.xaml" />
             </ResourceDictionary.MergedDictionaries>
             <Style TargetType="avalonedit:TextEditor">
                 <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
diff --git a/src/WPFDevelopers.Samples.Shared/Controls/NavigateMenu/NavigateMenu.xaml b/src/WPFDevelopers.Samples.Shared/Controls/NavigateMenu/NavigateMenu.xaml
deleted file mode 100644
index bea80d47..00000000
--- a/src/WPFDevelopers.Samples.Shared/Controls/NavigateMenu/NavigateMenu.xaml
+++ /dev/null
@@ -1,158 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers">
-
-    <ControlTemplate x:Key="WD.NavigateMenuLeft" TargetType="{x:Type controls:NavigateMenu}">
-        <wd:WDBorder
-            x:Name="Border"
-            Margin="{TemplateBinding Margin}"
-            Padding="{TemplateBinding Padding}"
-            Background="{TemplateBinding Background}"
-            BorderBrush="{TemplateBinding BorderBrush}"
-            BorderThickness="{TemplateBinding BorderThickness}"
-            CornerRadius="{Binding Path=(wd:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-            SnapsToDevicePixels="True">
-            <wd:SmallPanel Clip="{Binding RelativeSource={RelativeSource AncestorType=wd:WDBorder}, Path=ContentClip}" ClipToBounds="True">
-                <ListBox
-                    x:Name="PART_ListBox"
-                    Background="Transparent"
-                    DisplayMemberPath="{Binding DisplayMemberPath, RelativeSource={RelativeSource AncestorType={x:Type controls:NavigateMenu}}}"
-                    ItemsSource="{TemplateBinding ItemsSource}"
-                    ScrollViewer.VerticalScrollBarVisibility="Hidden"
-                    SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource AncestorType={x:Type controls:NavigateMenu}}}"
-                    SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource AncestorType={x:Type controls:NavigateMenu}}}">
-                    <ListBox.ItemContainerStyle>
-                        <Style BasedOn="{x:Null}" TargetType="ListBoxItem">
-                            <Setter Property="VerticalContentAlignment" Value="Center" />
-                            <Setter Property="Padding" Value="10,8" />
-                            <Setter Property="Visibility" Value="{Binding IsVisible, Converter={StaticResource WD.Bool2VisibilityConverter}}" />
-                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-                            <Setter Property="Template">
-                                <Setter.Value>
-                                    <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                                        <Border
-                                            x:Name="PART_Border"
-                                            Padding="{TemplateBinding Padding}"
-                                            Background="{TemplateBinding Background}"
-                                            BorderBrush="{TemplateBinding BorderBrush}"
-                                            BorderThickness="{TemplateBinding BorderThickness}"
-                                            SnapsToDevicePixels="true">
-                                            <ContentPresenter
-                                                HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                                        </Border>
-                                        <ControlTemplate.Triggers>
-                                            <Trigger Property="IsSelected" Value="True">
-                                                <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-                                                <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
-                                            </Trigger>
-                                            <Trigger Property="IsMouseOver" Value="True">
-                                                <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
-                                            </Trigger>
-                                        </ControlTemplate.Triggers>
-                                    </ControlTemplate>
-                                </Setter.Value>
-                            </Setter>
-                        </Style>
-                    </ListBox.ItemContainerStyle>
-                </ListBox>
-                <Rectangle
-                    x:Name="PART_RectangleSlider"
-                    Width="3"
-                    Height="{TemplateBinding Height}"
-                    HorizontalAlignment="Right"
-                    Fill="Transparent" />
-                <Rectangle
-                    Width="3"
-                    Height="35"
-                    HorizontalAlignment="Right"
-                    VerticalAlignment="Top"
-                    Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}">
-                    <Rectangle.RenderTransform>
-                        <TranslateTransform x:Name="PART_TranslateTransform" />
-                    </Rectangle.RenderTransform>
-                </Rectangle>
-            </wd:SmallPanel>
-        </wd:WDBorder>
-    </ControlTemplate>
-    <!--  还未完成  -->
-    <Style
-        x:Key="WD.NavigateMenuItem"
-        BasedOn="{StaticResource WD.ControlBasicStyle}"
-        TargetType="{x:Type ListBoxItem}">
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <!--<Setter Property="Padding" Value="10,8" />-->
-        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type ListBoxItem}">
-                    <Border
-                        x:Name="PART_Border"
-                        Padding="{TemplateBinding Padding}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        SnapsToDevicePixels="true">
-                        <ContentPresenter
-                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-                    </Border>
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="IsSelected" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
-                        </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-    <ControlTemplate x:Key="WD.NavigateMenuTop" TargetType="{x:Type controls:NavigateMenu}">
-        <Grid>
-            <Rectangle
-                x:Name="PART_RectangleSlider"
-                Width="{TemplateBinding Width}"
-                Height="3"
-                VerticalAlignment="Bottom"
-                Fill="{DynamicResource WD.LighterSolidColorBrush}" />
-            <Rectangle
-                Width="{TemplateBinding RectangleSelectWidth}"
-                Height="3"
-                HorizontalAlignment="Left"
-                VerticalAlignment="Bottom"
-                Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}">
-                <Rectangle.RenderTransform>
-                    <TranslateTransform x:Name="PART_TranslateTransform" />
-                </Rectangle.RenderTransform>
-            </Rectangle>
-            <ItemsPresenter />
-        </Grid>
-    </ControlTemplate>
-    <Style
-        x:Key="WD.NavigateMenu"
-        BasedOn="{StaticResource WD.ControlBasicStyle}"
-        TargetType="{x:Type controls:NavigateMenu}">
-        <Style.Triggers>
-            <Trigger Property="TabStripPlacement" Value="Left">
-                <Setter Property="Template" Value="{StaticResource WD.NavigateMenuLeft}" />
-            </Trigger>
-            <Trigger Property="TabStripPlacement" Value="Top">
-                <Setter Property="ItemsPanel">
-                    <Setter.Value>
-                        <ItemsPanelTemplate>
-                            <VirtualizingStackPanel Orientation="Horizontal" />
-                        </ItemsPanelTemplate>
-                    </Setter.Value>
-                </Setter>
-                <Setter Property="Template" Value="{StaticResource WD.NavigateMenuTop}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-    <Style BasedOn="{StaticResource WD.NavigateMenu}" TargetType="{x:Type controls:NavigateMenu}" />
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/AcrylicBlurWindowExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/AcrylicBlurWindowExample.xaml
index 7b853af8..f0ae2710 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/AcrylicBlurWindowExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/AcrylicBlurWindowExample.xaml
@@ -4,13 +4,13 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-        xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+        xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
         mc:Ignorable="d" WindowStartupLocation="CenterScreen"
         ResizeMode="CanMinimize"
         Title="Login" Height="350" Width="400">
-    <wd:WindowAcrylicBlur.WindowAcrylicBlur>
-        <wd:WindowAcrylicBlur BlurColor="AliceBlue" Opacity="0.2"/>
-    </wd:WindowAcrylicBlur.WindowAcrylicBlur>
+    <wpfdev:WindowAcrylicBlur.WindowAcrylicBlur>
+        <wpfdev:WindowAcrylicBlur BlurColor="AliceBlue" Opacity="0.2"/>
+    </wpfdev:WindowAcrylicBlur.WindowAcrylicBlur>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="40"/>
@@ -33,8 +33,8 @@
         <StackPanel Grid.Row="1" Margin="40,0,40,0"
                     x:Name="MyStackPanelContent">
             <Image Source="/WPFDevelopers.ico" Width="80" Height="80"/>
-            <TextBox wd:ElementHelper.Watermark="账户" Margin="0,20,0,0" Cursor="Hand"/>
-            <PasswordBox  wd:ElementHelper.Watermark="密码"  Margin="0,20,0,0" Cursor="Hand"/>
+            <TextBox wpfdev:ElementHelper.Watermark="账户" Margin="0,20,0,0" Cursor="Hand"/>
+            <PasswordBox  wpfdev:ElementHelper.Watermark="密码"  Margin="0,20,0,0" Cursor="Hand"/>
             <Button x:Name="LoginButton" 
                     Content="登 录" 
                     Margin="0,20,0,0"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml
index ce59e168..42a5b9e6 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationAudioExample.xaml
@@ -4,14 +4,14 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
         <UniformGrid Columns="2" x:Name="MyUniformGrid">
         <StackPanel Orientation="Horizontal">
-            <wd:BreathLamp Width="60" Height="60" LampEffect="Ripple"  IsLampStart="true"
+            <wpfdev:BreathLamp Width="60" Height="60" LampEffect="Ripple"  IsLampStart="true"
                                    VerticalAlignment="Center" HorizontalAlignment="Left"
                                Margin="10,0">
                 <Ellipse>
@@ -19,16 +19,16 @@
                             <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Breathe/0.jpg"/>
                     </Ellipse.Fill>
                 </Ellipse>
-            </wd:BreathLamp>
-            <wd:AnimationAudio x:Name="AnimationAudioLeft" MouseDown="AnimationAudioLeft_MouseDown"/>
+            </wpfdev:BreathLamp>
+            <wpfdev:AnimationAudio x:Name="AnimationAudioLeft" MouseDown="AnimationAudioLeft_MouseDown"/>
         </StackPanel>
         <StackPanel Orientation="Horizontal"
                     HorizontalAlignment="Right">
-            <wd:AnimationAudio x:Name="AnimationAudioRight" IsRight ="true" 
+            <wpfdev:AnimationAudio x:Name="AnimationAudioRight" IsRight ="true" 
                                Background="{DynamicResource WD.SuccessSolidColorBrush}"
                                Foreground="Black"
                                MouseDown="AnimationAudioLeft_MouseDown"/>
-            <wd:BreathLamp Width="60" Height="60" LampEffect="Streamer"  IsLampStart="True"
+            <wpfdev:BreathLamp Width="60" Height="60" LampEffect="Streamer"  IsLampStart="True"
                                VerticalAlignment="Center" HorizontalAlignment="Left" 
                                GradientStopColor1="#FF00cec9" GradientStopColor2="#2000cec9"
                                Margin="10,0">
@@ -37,7 +37,7 @@
                             <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Chat/UserImages/yanjinhua.png"/>
                     </Ellipse.Fill>
                 </Ellipse>
-            </wd:BreathLamp>
+            </wpfdev:BreathLamp>
         </StackPanel>
         </UniformGrid>
         <controls:CodeViewer.SourceCodes>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationNavigationBar3DExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationNavigationBar3DExample.xaml
index 45122367..5dd6b579 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationNavigationBar3DExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/AnimationNavigationBar3DExample.xaml
@@ -20,77 +20,34 @@
                 Height="235"
                 Margin="10,0"
                 VerticalAlignment="Top"
-                Background="{DynamicResource WD.BackgroundSolidColorBrush}"
+                Background="#F9F7F9"
                 SnapsToDevicePixels="True">
                 <wd:AnimationNavigationBar3D VerticalAlignment="Bottom">
-                    <wd:AnimationNavigationBar3DItem Background="#E21854" Fill="#FD3574">
-                        <StackPanel VerticalAlignment="Center">
-                            <Path
-                                Width="40"
-                                Height="40"
-                                Data="{StaticResource WD.SmileyOutlineGeometry}"
-                                Fill="{DynamicResource WD.WindowForegroundColorBrush}"
-                                Stretch="Uniform" />
-                            <TextBlock HorizontalAlignment="Center" Text="Emoji" />
-                        </StackPanel>
-                    </wd:AnimationNavigationBar3DItem>
-                    <wd:AnimationNavigationBar3DItem Background="#41A545" Fill="#5EECA6">
-                        <StackPanel VerticalAlignment="Center">
-                            <Path
-                                Width="40"
-                                Height="40"
-                                Data="{StaticResource WD.BusGeometry}"
-                                Fill="{DynamicResource WD.WindowForegroundColorBrush}"
-                                Stretch="Uniform" />
-                            <TextBlock HorizontalAlignment="Center" Text="Bus" />
-                        </StackPanel>
-                    </wd:AnimationNavigationBar3DItem>
-                    <wd:AnimationNavigationBar3DItem Background="#0A58F0" Fill="#3A7DFE">
-                        <StackPanel VerticalAlignment="Center">
-                            <Path
-                                Width="40"
-                                Height="40"
-                                Data="{StaticResource WD.FriendGeometry}"
-                                Fill="{DynamicResource WD.WindowForegroundColorBrush}"
-                                Stretch="Uniform" />
-                            <TextBlock HorizontalAlignment="Center" Text="Friend" />
-                        </StackPanel>
-                    </wd:AnimationNavigationBar3DItem>
-                    <wd:AnimationNavigationBar3DItem Background="#5F0574" Fill="#8E1FA4">
-                        <StackPanel VerticalAlignment="Center">
-                            <Path
-                                Width="40"
-                                Height="40"
-                                Data="{StaticResource WD.AlarmClockGeometry}"
-                                Fill="{DynamicResource WD.WindowForegroundColorBrush}"
-                                Stretch="Uniform" />
-                            <TextBlock HorizontalAlignment="Center" Text="Clock" />
-                        </StackPanel>
-                    </wd:AnimationNavigationBar3DItem>
-                    <wd:AnimationNavigationBar3DItem Background="#1F0355" Fill="#5B31AD">
-                        <wd:AnimationNavigationBar3DItem.Content>
-                            <StackPanel VerticalAlignment="Center">
-                                <Path
-                                    Width="40"
-                                    Height="40"
-                                    Data="{StaticResource WD.BuildingRegularGeometry}"
-                                    Fill="{DynamicResource WD.WindowForegroundColorBrush}"
-                                    Stretch="Uniform" />
-                                <TextBlock HorizontalAlignment="Center" Text="Regular" />
-                            </StackPanel>
-                        </wd:AnimationNavigationBar3DItem.Content>
-                        <wd:AnimationNavigationBar3DItem.ContentBack>
-                            <StackPanel VerticalAlignment="Center">
-                                <Path
-                                    Width="40"
-                                    Height="40"
-                                    Data="{StaticResource WD.BuildingRegularGeometry}"
-                                    Fill="{DynamicResource WD.WindowForegroundColorBrush}"
-                                    Stretch="Uniform" />
-                                <TextBlock HorizontalAlignment="Center" Text="建筑" />
-                            </StackPanel>
-                        </wd:AnimationNavigationBar3DItem.ContentBack>
-                    </wd:AnimationNavigationBar3DItem>
+                    <wd:AnimationNavigationBar3DItem
+                        BackFileBackground="#E21854"
+                        FileBackground="#FD3574"
+                        PathDate="{StaticResource WD.SmileyOutlineGeometry}"
+                        Text="Emoji" />
+                    <wd:AnimationNavigationBar3DItem
+                        BackFileBackground="#41A545"
+                        FileBackground="#5EECA6"
+                        PathDate="{StaticResource WD.BusGeometry}"
+                        Text="Bus" />
+                    <wd:AnimationNavigationBar3DItem
+                        BackFileBackground="#0A58F0"
+                        FileBackground="#3A7DFE"
+                        PathDate="{StaticResource WD.FriendGeometry}"
+                        Text="Friend" />
+                    <wd:AnimationNavigationBar3DItem
+                        BackFileBackground="#5F0574"
+                        FileBackground="#8E1FA4"
+                        PathDate="{StaticResource WD.AlarmClockGeometry}"
+                        Text="Clock" />
+                    <wd:AnimationNavigationBar3DItem
+                        BackFileBackground="#1F0355"
+                        FileBackground="#5B31AD"
+                        PathDate="{StaticResource WD.BuildingRegularGeometry}"
+                        Text="Regular" />
                 </wd:AnimationNavigationBar3D>
             </Border>
             <Border
@@ -118,6 +75,7 @@
                     VerticalAlignment="Top"
                     FontSize="20"
                     FontWeight="Black"
+                    Foreground="Black"
                     Text="微信号公众号:WPFDevelopers" />
                 <TextBlock
                     Margin="0,20"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BarrageExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BarrageExample.xaml
index f9ce9740..4b0817eb 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BarrageExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BarrageExample.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
@@ -28,7 +28,7 @@
                 </Grid.ColumnDefinitions>
                 <TextBox 
                      x:Name="tbBarrage"
-                     wd:ElementHelper.Watermark="请弹幕内容"/>
+                     wpfdev:ElementHelper.Watermark="请弹幕内容"/>
                 <Button Grid.Column="1" Style="{StaticResource WD.PrimaryButton}"
                     Content="发射弹幕" Margin="4,0,0,0" 
                     Click="ButtonBase_OnClick"/>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml
new file mode 100644
index 00000000..eb5894aa
--- /dev/null
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml
@@ -0,0 +1,57 @@
+<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.BasicBarChartExample"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <controls:CodeViewer>
+    <Grid Background="{DynamicResource WD.BackgroundSolidColorBrush}">
+        <Border
+            Height="500"
+            Background="{DynamicResource WD.BackgroundSolidColorBrush}"
+            Margin="30,0">
+            <Grid Margin="20,10">
+                
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="40" />
+                    <RowDefinition />
+                    <RowDefinition Height="auto" />
+                </Grid.RowDefinitions>
+                <WrapPanel HorizontalAlignment="Right">
+                    <Rectangle
+                        Width="6"
+                        Height="26"
+                        Fill="Black" />
+                    <TextBlock
+                        Padding="10,0"
+                        FontSize="24"
+                        FontWeight="Black"
+                        Text="{Binding KeyBarChart, RelativeSource={RelativeSource AncestorType=local:BasicBarChartExample}}" />
+                </WrapPanel>
+                <wpfdev:BasicBarChart
+                     Grid.Row="1" 
+                    SeriesArray="{Binding SeriesModels, RelativeSource={RelativeSource AncestorType=local:BasicBarChartExample}}"/>
+                <Button
+                    Grid.Row="2"
+                    Width="200"
+                    VerticalAlignment="Bottom"
+                    Click="Button_Click"
+                    Content="刷新"
+                    Style="{StaticResource WD.PrimaryButton}" />
+            </Grid>
+        </Border>
+    </Grid>
+        <controls:CodeViewer.SourceCodes>
+            <controls:SourceCodeModel 
+                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/BasicBarChartExample.xaml" 
+                CodeType="Xaml"/>
+            <controls:SourceCodeModel 
+                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/BasicBarChartExample.xaml.cs" 
+                CodeType="CSharp"/>
+        </controls:CodeViewer.SourceCodes>
+    </controls:CodeViewer>
+</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml.cs
similarity index 81%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml.cs
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml.cs
index c5b48bfd..04e7bdc0 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicBarChartExample.xaml.cs
@@ -1,14 +1,23 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
 
 namespace WPFDevelopers.Samples.ExampleViews
 {
     /// <summary>
-    /// ChartBarExample.xaml 的交互逻辑
+    /// BasicBarChartExample.xaml 的交互逻辑
     /// </summary>
-    public partial class ChartBarExample : UserControl
+    public partial class BasicBarChartExample : UserControl
     {
         public IEnumerable<KeyValuePair<string, double>> SeriesModels
         {
@@ -17,7 +26,7 @@ public IEnumerable<KeyValuePair<string, double>> SeriesModels
         }
 
         public static readonly DependencyProperty SeriesModelsProperty =
-            DependencyProperty.Register("SeriesModels", typeof(IEnumerable<KeyValuePair<string, double>>), typeof(ChartBarExample), new PropertyMetadata(null));
+            DependencyProperty.Register("SeriesModels", typeof(IEnumerable<KeyValuePair<string, double>>), typeof(BasicBarChartExample), new PropertyMetadata(null));
 
 
         Dictionary<string, IEnumerable<KeyValuePair<string, double>>> keyValues = new Dictionary<string, IEnumerable<KeyValuePair<string, double>>>();
@@ -27,9 +36,9 @@ public string KeyBarChart
             set { SetValue(KeyBarChartProperty, value); }
         }
         public static readonly DependencyProperty KeyBarChartProperty =
-     DependencyProperty.Register("KeyBarChart", typeof(string), typeof(ChartBarExample), new PropertyMetadata(null));
+     DependencyProperty.Register("KeyBarChart", typeof(string), typeof(BasicBarChartExample), new PropertyMetadata(null));
         private int _index = 0;
-        public ChartBarExample()
+        public BasicBarChartExample()
         {
             InitializeComponent();
             var Models1 = new[]
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
index 791196ee..569f7811 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BasicControlsExample.xaml
@@ -181,8 +181,8 @@
                         <Button wd:Badge.IsShow="True" Content="Default" />
                         <Button
                             Margin="10,0"
-                            wd:ElementHelper.CornerRadius="3"
-                            Content="Default" />
+                            Content="Default"
+                            IsEnabled="False" />
                         <Button
                             wd:Badge.IsShow="True"
                             wd:Badge.Text="new"
@@ -190,8 +190,8 @@
                             Style="{DynamicResource WD.PrimaryButton}" />
                         <Button
                             Margin="10,0"
-                            wd:ElementHelper.CornerRadius="3"
                             Content="Default"
+                            IsEnabled="False"
                             Style="{DynamicResource WD.PrimaryButton}" />
                     </UniformGrid>
                     <UniformGrid
@@ -206,14 +206,14 @@
                             Style="{DynamicResource WD.SuccessDefaultButton}" />
                         <Button
                             Margin="10,0"
-                            wd:ElementHelper.CornerRadius="3"
                             Content="Success"
+                            IsEnabled="False"
                             Style="{DynamicResource WD.SuccessDefaultButton}" />
                         <Button Content="Success" Style="{DynamicResource WD.SuccessPrimaryButton}" />
                         <Button
                             Margin="10,0"
-                            wd:ElementHelper.CornerRadius="3"
                             Content="Success"
+                            IsEnabled="False"
                             Style="{DynamicResource WD.SuccessPrimaryButton}" />
                     </UniformGrid>
                     <UniformGrid
@@ -228,14 +228,14 @@
                             Style="{DynamicResource WD.WarningDefaultButton}" />
                         <Button
                             Margin="10,0"
-                            wd:ElementHelper.CornerRadius="3"
                             Content="Warning"
+                            IsEnabled="False"
                             Style="{DynamicResource WD.WarningDefaultButton}" />
                         <Button Content="Warning" Style="{DynamicResource WD.WarningPrimaryButton}" />
                         <Button
                             Margin="10,0"
-                            wd:ElementHelper.CornerRadius="3"
                             Content="Warning"
+                            IsEnabled="False"
                             Style="{DynamicResource WD.WarningPrimaryButton}" />
                     </UniformGrid>
                     <UniformGrid
@@ -249,14 +249,14 @@
                             Style="{DynamicResource WD.DangerDefaultButton}" />
                         <Button
                             Margin="10,0"
-                            wd:ElementHelper.CornerRadius="3"
                             Content="Danger"
+                            IsEnabled="False"
                             Style="{DynamicResource WD.DangerDefaultButton}" />
                         <Button Content="Danger" Style="{DynamicResource WD.DangerPrimaryButton}" />
                         <Button
                             Margin="10,0"
-                            wd:ElementHelper.CornerRadius="3"
                             Content="Danger"
+                            IsEnabled="False"
                             Style="{DynamicResource WD.DangerPrimaryButton}" />
                     </UniformGrid>
                     <TextBlock
@@ -310,7 +310,6 @@
                         <CheckBox Content="Option A" />
                         <CheckBox
                             Margin="10,0"
-                            wd:ElementHelper.CornerRadius="3"
                             Content="Option B"
                             IsChecked="True" />
                         <CheckBox Content="Option C" IsChecked="{x:Null}" />
@@ -324,11 +323,8 @@
                         FontSize="20"
                         Text="TextBox" />
                     <UniformGrid Margin="0,10" Rows="1">
-                        <TextBox wd:ElementHelper.CornerRadius="3" />
-                        <TextBox
-                            Margin="10,0"
-                            wd:ElementHelper.IsClear="True"
-                            wd:ElementHelper.Watermark="TextBox" />
+                        <TextBox />
+                        <TextBox Margin="10,0" wd:ElementHelper.Watermark="TextBox" />
                         <TextBox IsEnabled="False" />
                     </UniformGrid>
                     <TextBlock
@@ -336,11 +332,8 @@
                         FontSize="20"
                         Text="PasswordBox" />
                     <UniformGrid Margin="0,10" Rows="1">
-                        <PasswordBox wd:ElementHelper.CornerRadius="3" />
-                        <PasswordBox
-                            Margin="10,0"
-                            wd:ElementHelper.IsClear="True"
-                            wd:ElementHelper.Watermark="PasswordBox" />
+                        <PasswordBox />
+                        <PasswordBox Margin="10,0" wd:ElementHelper.Watermark="PasswordBox" />
                         <PasswordBox IsEnabled="False" />
                         <PasswordBox
                             x:Name="myPasswordBox"
@@ -364,10 +357,7 @@
                             <ComboBoxItem>Option 5</ComboBoxItem>
                         </ComboBox>
                         <ComboBox Margin="10,0" IsEnabled="False" />
-                        <ComboBox
-                            wd:ElementHelper.CornerRadius="3"
-                            wd:ElementHelper.Watermark="ComboBox"
-                            IsEditable="True">
+                        <ComboBox wd:ElementHelper.Watermark="ComboBox" IsEditable="True">
                             <ComboBoxItem>Option 1</ComboBoxItem>
                             <ComboBoxItem>Option 2</ComboBoxItem>
                             <ComboBoxItem>Option 3</ComboBoxItem>
@@ -396,7 +386,7 @@
                         FontSize="20"
                         Text="DatePicker" />
                     <UniformGrid Margin="0,10" Rows="1">
-                        <DatePicker wd:DatePickerHelper.Watermark="日期 yyyy/MM/dd" wd:ElementHelper.CornerRadius="3" />
+                        <DatePicker wd:DatePickerHelper.Watermark="日期 yyyy/MM/dd" />
                         <DatePicker
                             Margin="10,0"
                             wd:DatePickerHelper.Watermark="DatePicker"
@@ -413,7 +403,7 @@
                         FontSize="20"
                         Text="Calendar" />
                     <WrapPanel Margin="0,10">
-                        <Calendar wd:ElementHelper.CornerRadius="3" />
+                        <Calendar />
                         <Calendar Margin="10,0" SelectionMode="SingleRange" />
                         <Calendar SelectionMode="MultipleRange">
                             <Calendar.BlackoutDates>
@@ -427,7 +417,7 @@
                         FontSize="20"
                         Text="Slider" />
                     <WrapPanel Margin="0,10">
-                        <Slider Width="200" wd:ElementHelper.CornerRadius="3" />
+                        <Slider Width="200" />
                         <Slider
                             Width="200"
                             Margin="10,0"
@@ -438,12 +428,6 @@
                             IsEnabled="False"
                             Maximum="100"
                             Value="50" />
-                        <Slider
-                            Height="200"
-                            Maximum="10"
-                            Minimum="0"
-                            Orientation="Vertical"
-                            Value="3" />
                     </WrapPanel>
 
                     <TextBlock
@@ -451,10 +435,7 @@
                         FontSize="20"
                         Text="ProgressBar" />
                     <WrapPanel Margin="0,10">
-                        <ProgressBar
-                            Width="200"
-                            wd:ElementHelper.CornerRadius="3"
-                            Value="50" />
+                        <ProgressBar Width="200" Value="50" />
                         <ProgressBar
                             Width="200"
                             Margin="10,0"
@@ -465,25 +446,19 @@
                             Margin="10,0"
                             IsIndeterminate="True"
                             Value="10" />
-                        <ProgressBar
-                            Width="10"
-                            Height="200"
-                            Margin="10,0"
-                            Orientation="Vertical"
-                            Value="10" />
+
                     </WrapPanel>
 
                     <TextBlock
                         Margin="0,20,0,0"
                         FontSize="20"
                         Text="DataGrid" />
-                    <TabControl Height="200" Margin="0,10">
+                    <TabControl Margin="0,10" BorderThickness="0">
                         <TabItem
                             Height="38"
                             Padding="20,0"
                             Header="Mode 1">
                             <DataGrid
-                                wd:ElementHelper.CornerRadius="3"
                                 AutoGenerateColumns="False"
                                 HeadersVisibility="All"
                                 ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}"
@@ -595,8 +570,8 @@
                         Text="ListBox" />
                     <UniformGrid Margin="0,10" Columns="2">
                         <ListBox
-                            wd:ElementHelper.CornerRadius="3"
                             DisplayMemberPath="Name"
+                            IsEnabled="False"
                             ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}" />
                         <ListBox Margin="10,0" ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}">
                             <ListBox.ItemTemplate>
@@ -616,7 +591,7 @@
                         FontSize="20"
                         Text="ListView" />
                     <UniformGrid Margin="0,10" Columns="2">
-                        <ListView wd:ElementHelper.CornerRadius="3" ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}">
+                        <ListView ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}">
                             <ListView.View>
                                 <GridView>
                                     <GridViewColumn DisplayMemberBinding="{Binding Date}" Header="Date" />
@@ -631,6 +606,7 @@
                         <ListView
                             Margin="10,0"
                             BorderThickness="0"
+                            IsEnabled="False"
                             ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}">
                             <ListView.View>
                                 <GridView>
@@ -653,7 +629,7 @@
                         Height="400"
                         Margin="0,10"
                         Columns="2">
-                        <TreeView wd:ElementHelper.CornerRadius="3" ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}">
+                        <TreeView ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}">
                             <TreeView.ItemTemplate>
                                 <HierarchicalDataTemplate ItemsSource="{Binding Children}">
                                     <Border>
@@ -665,6 +641,7 @@
                         <TreeView
                             Margin="10,0"
                             BorderThickness="0"
+                            IsEnabled="False"
                             ItemsSource="{Binding UserCollection, RelativeSource={RelativeSource AncestorType=UserControl}}">
                             <TreeView.ItemTemplate>
                                 <HierarchicalDataTemplate ItemsSource="{Binding Children}">
@@ -681,7 +658,7 @@
                         FontSize="20"
                         Text="Expander" />
                     <UniformGrid Margin="0,10" Columns="2">
-                        <Expander wd:ElementHelper.CornerRadius="3" Header="Expander1">
+                        <Expander Header="Expander1">
                             <Rectangle
                                 Width="400"
                                 Height="300"
@@ -733,13 +710,16 @@
                         FontSize="20"
                         Text="GroupBox" />
                     <UniformGrid Margin="0,10" Columns="2">
-                        <GroupBox wd:ElementHelper.CornerRadius="3" Header="GroupBox1">
+                        <GroupBox Header="GroupBox1">
                             <Rectangle
                                 Width="400"
                                 Height="300"
                                 Fill="{DynamicResource WD.DangerSolidColorBrush}" />
                         </GroupBox>
-                        <GroupBox Margin="10,0" Header="GroupBox1">
+                        <GroupBox
+                            Margin="10,0"
+                            Header="GroupBox1"
+                            IsEnabled="False">
                             <Rectangle
                                 Width="400"
                                 Height="300"
@@ -762,25 +742,25 @@
                                 <Setter Property="Height" Value="400" />
                             </Style>
                         </UniformGrid.Resources>
-                        <TabControl Margin="4" wd:ElementHelper.CornerRadius="3">
-                            <TabItem Padding="10" Header="TabItem1">
+                        <TabControl Margin="4">
+                            <TabItem Padding="20,0" Header="TabItem1">
                                 <Rectangle Fill="{DynamicResource WD.DangerSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem2">
+                            <TabItem Header="TabItem2">
                                 <Rectangle Fill="{DynamicResource WD.InfoSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem3">
+                            <TabItem Header="TabItem3">
                                 <Rectangle Fill="{DynamicResource WD.WarningSolidColorBrush}" />
                             </TabItem>
                         </TabControl>
                         <TabControl Margin="4" TabStripPlacement="Bottom">
-                            <TabItem Padding="10" Header="TabItem1">
+                            <TabItem Padding="20,0" Header="TabItem1">
                                 <Rectangle Fill="{DynamicResource WD.InfoSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem2">
+                            <TabItem Header="TabItem2">
                                 <Rectangle Fill="{DynamicResource WD.DangerSolidColorBrush}" />
                             </TabItem>
-                            <TabItem Padding="10" Header="TabItem3">
+                            <TabItem Header="TabItem3">
                                 <Rectangle Fill="{DynamicResource WD.WarningSolidColorBrush}" />
                             </TabItem>
                         </TabControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BreatheLightExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BreatheLightExample.xaml
index bfe7858c..a358774c 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BreatheLightExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BreatheLightExample.xaml
@@ -1,201 +1,149 @@
-<UserControl
-    x:Class="WPFDevelopers.Samples.ExampleViews.BreatheLightExample"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
+<UserControl x:Class="WPFDevelopers.Samples.ExampleViews.BreatheLightExample"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <UniformGrid Columns="2">
-            <Border
-                Width="400"
-                Height="140"
-                Background="{StaticResource WD.BackgroundSolidColorBrush}"
-                CornerRadius="3"
-                Effect="{StaticResource WD.NormalShadowDepth}">
-                <Grid Margin="20,20,0,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <wd:BreathLamp
-                        Width="60"
-                        Height="60"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Background="{DynamicResource WD.BlackSolidColorBrush}"
-                        EffectColor="{DynamicResource WD.DefaultBackgroundPressedColor}"
-                        IsLampStart="true"
-                        LampEffect="OuterGlow">
-                        <Ellipse>
-                            <Ellipse.Fill>
-                                <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Breathe/2.jpg" />
-                            </Ellipse.Fill>
-                        </Ellipse>
-                    </wd:BreathLamp>
+    <UniformGrid Columns="2">
+        <Border Effect="{StaticResource WD.NormalShadowDepth}" Width="400" Height="140" Background="{StaticResource WD.BackgroundSolidColorBrush}"
+                CornerRadius="3">
+            <Grid Margin="20,20,0,0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <wpfdev:BreathLamp Width="60" Height="60" LampEffect="OuterGlow" IsLampStart="true"
+                                   VerticalAlignment="Top" HorizontalAlignment="Left"
+                                   Background="{DynamicResource WD.BlackSolidColorBrush}" 
+                                   EffectColor="{DynamicResource WD.DefaultBackgroundPressedColor}">
+                    <Ellipse>
+                        <Ellipse.Fill>
+                                <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Breathe/2.jpg"/>
+                        </Ellipse.Fill>
+                    </Ellipse>
+                </wpfdev:BreathLamp>
 
-                    <TextBlock
-                        Grid.Column="1"
-                        Margin="10,20"
-                        FontSize="{StaticResource WD.MediumFontSize}">
-                        <Run Foreground="{StaticResource WD.PrimaryTextSolidColorBrush}">
-                            周星星|达叔
-                        </Run>
-                        <Run Foreground="{StaticResource WD.SuccessPressedSolidColorBrush}">正在直播</Run>
-                    </TextBlock>
-                    <Button
-                        Grid.Column="1"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Bottom"
-                        Content="进入直播"
-                        Style="{StaticResource WD.PrimaryButton}" />
-                </Grid>
-
-            </Border>
+                <TextBlock Grid.Column="1" 
+                           Margin="10,20"
+                           FontSize="{StaticResource WD.MediumFontSize}">
+                    <Run Foreground="{StaticResource WD.PrimaryTextSolidColorBrush}">
+                        周星星|达叔
+                    </Run>
+                    <Run Foreground="{StaticResource WD.SuccessPressedSolidColorBrush}">正在直播</Run>
+                </TextBlock>
+                <Button Style="{StaticResource WD.PrimaryButton}" Grid.Column="1" 
+                        HorizontalAlignment="Right" 
+                        VerticalAlignment="Bottom" Content="进入直播"/>
+            </Grid>
+            
+        </Border>
 
-            <Border
-                Width="400"
-                Height="140"
-                Background="{StaticResource WD.BackgroundSolidColorBrush}"
-                CornerRadius="3"
-                Effect="{StaticResource WD.NormalShadowDepth}">
-                <Grid Margin="20,20,0,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <wd:BreathLamp
-                        Width="60"
-                        Height="60"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        Background="LightGreen"
-                        EffectColor="LightGreen"
-                        IsLampStart="true"
-                        LampEffect="Eclipse">
-                        <Ellipse>
-                            <Ellipse.Fill>
-                                <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Breathe/1.jpg" />
-                            </Ellipse.Fill>
-                        </Ellipse>
-                    </wd:BreathLamp>
+        <Border Effect="{StaticResource WD.NormalShadowDepth}" Width="400" Height="140" Background="{StaticResource WD.BackgroundSolidColorBrush}"
+                CornerRadius="3">
+            <Grid Margin="20,20,0,0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <wpfdev:BreathLamp Width="60" Height="60" LampEffect="Eclipse"  IsLampStart="true"
+                                   VerticalAlignment="Top" HorizontalAlignment="Left"
+                                   Background="LightGreen" EffectColor="LightGreen">
+                    <Ellipse>
+                        <Ellipse.Fill>
+                                <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Breathe/1.jpg"/>
+                        </Ellipse.Fill>
+                    </Ellipse>
+                </wpfdev:BreathLamp>
 
-                    <TextBlock
-                        Grid.Column="1"
-                        Margin="10,20"
-                        FontSize="{StaticResource WD.MediumFontSize}"
-                        TextWrapping="Wrap">
-                        <Run Foreground="{StaticResource WD.PrimaryTextSolidColorBrush}">
-                            大话西游之大圣娶亲&#x000A;
-                        </Run>
-                        <Run Foreground="{StaticResource WD.SuccessPressedSolidColorBrush}">正在直播</Run>
-                    </TextBlock>
-                    <Button
-                        Grid.Column="1"
+                <TextBlock Grid.Column="1" 
+                           Margin="10,20"
+                           FontSize="{StaticResource WD.MediumFontSize}"
+                           TextWrapping="Wrap">
+                    <Run Foreground="{StaticResource WD.PrimaryTextSolidColorBrush}">
+                        大话西游之大圣娶亲&#x000A;
+                    </Run>
+                    <Run Foreground="{StaticResource WD.SuccessPressedSolidColorBrush}">正在直播</Run>
+                </TextBlock>
+                <Button Style="{StaticResource WD.PrimaryButton}" Grid.Column="1" 
                         HorizontalAlignment="Right"
-                        VerticalAlignment="Bottom"
-                        Content="进入直播"
-                        Style="{StaticResource WD.PrimaryButton}" />
-                </Grid>
-            </Border>
-            <Border
-                Width="400"
-                Height="140"
-                Background="{StaticResource WD.BackgroundSolidColorBrush}"
-                CornerRadius="3"
-                Effect="{StaticResource WD.NormalShadowDepth}">
+                        VerticalAlignment="Bottom" Content="进入直播" Width="100"/>
+            </Grid>
+        </Border>
+        <Border Effect="{StaticResource WD.NormalShadowDepth}" Width="400" Height="140" Background="{StaticResource WD.BackgroundSolidColorBrush}"
+                CornerRadius="3">
+           
+            <Grid Margin="20,20,0,0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <wpfdev:BreathLamp Width="60" Height="60" LampEffect="Ripple"  IsLampStart="true"
+                                   VerticalAlignment="Top" HorizontalAlignment="Left">
+                    <Ellipse>
+                        <Ellipse.Fill>
+                                <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Breathe/0.jpg"/>
+                        </Ellipse.Fill>
+                    </Ellipse>
+                </wpfdev:BreathLamp>
 
-                <Grid Margin="20,20,0,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <wd:BreathLamp
-                        Width="60"
-                        Height="60"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        IsLampStart="true"
-                        LampEffect="Ripple">
-                        <Ellipse>
-                            <Ellipse.Fill>
-                                <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Breathe/0.jpg" />
-                            </Ellipse.Fill>
-                        </Ellipse>
-                    </wd:BreathLamp>
-
-                    <TextBlock
-                        Grid.Column="1"
-                        Margin="10,20"
-                        FontSize="{StaticResource WD.MediumFontSize}">
-                        <Run Foreground="{StaticResource WD.PrimaryTextSolidColorBrush}">
-                            XXXYYY
-                        </Run>
-                        <Run Foreground="{StaticResource WD.SuccessPressedSolidColorBrush}">正在直播</Run>
-                    </TextBlock>
-                    <Button
-                        Grid.Column="1"
+                <TextBlock Grid.Column="1" 
+                           Margin="10,20"
+                           FontSize="{StaticResource WD.MediumFontSize}">
+                    <Run Foreground="{StaticResource WD.PrimaryTextSolidColorBrush}">
+                        XXXYYY
+                    </Run>
+                    <Run Foreground="{StaticResource WD.SuccessPressedSolidColorBrush}">正在直播</Run>
+                </TextBlock>
+                <Button Style="{StaticResource WD.PrimaryButton}" Grid.Column="1" 
                         HorizontalAlignment="Right"
-                        VerticalAlignment="Bottom"
-                        Content="进入直播"
-                        Style="{StaticResource WD.PrimaryButton}" />
-                </Grid>
-            </Border>
+                        VerticalAlignment="Bottom" Content="进入直播" Width="100"/>
+            </Grid>
+        </Border>
 
-            <Border
-                Width="400"
-                Height="140"
-                Background="{StaticResource WD.BackgroundSolidColorBrush}"
-                CornerRadius="3"
-                Effect="{StaticResource WD.NormalShadowDepth}">
+        <Border Effect="{StaticResource WD.NormalShadowDepth}" Width="400" Height="140" Background="{StaticResource WD.BackgroundSolidColorBrush}"
+                CornerRadius="3">
 
-                <Grid Margin="20,20,0,0">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto" />
-                        <ColumnDefinition />
-                    </Grid.ColumnDefinitions>
-                    <wd:BreathLamp
-                        Width="60"
-                        Height="60"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Top"
-                        GradientStopColor1="#FF00cec9"
-                        GradientStopColor2="#2000cec9"
-                        IsLampStart="True"
-                        LampEffect="Streamer">
-                        <Ellipse Width="53" Height="53">
-                            <Ellipse.Fill>
-                                <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Chat/UserImages/yanjinhua.png" />
-                            </Ellipse.Fill>
-                        </Ellipse>
-                    </wd:BreathLamp>
+            <Grid Margin="20,20,0,0">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition/>
+                </Grid.ColumnDefinitions>
+                <wpfdev:BreathLamp Width="60" Height="60" LampEffect="Streamer"  IsLampStart="True"
+                                   VerticalAlignment="Top" HorizontalAlignment="Left" 
+                                   GradientStopColor1="#FF00cec9" GradientStopColor2="#2000cec9">
+                    <Ellipse Width="53" Height="53">
+                        <Ellipse.Fill>
+                                <ImageBrush ImageSource="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Chat/UserImages/yanjinhua.png"/>
+                        </Ellipse.Fill>
+                    </Ellipse>
+                </wpfdev:BreathLamp>
 
-                    <TextBlock
-                        Grid.Column="1"
-                        Margin="10,20"
-                        FontSize="{StaticResource WD.MediumFontSize}">
-                        <Run Foreground="{StaticResource WD.PrimaryTextSolidColorBrush}">
-                            WPF开发者
-                        </Run>
-                        <Run Foreground="{StaticResource WD.SuccessPressedSolidColorBrush}">正在直播</Run>
-                    </TextBlock>
-                    <Button
-                        Grid.Column="1"
-                        HorizontalAlignment="Right"
-                        VerticalAlignment="Bottom"
-                        Content="进入直播"
-                        Style="{StaticResource WD.PrimaryButton}" />
-                </Grid>
-            </Border>
-        </UniformGrid>
+                <TextBlock Grid.Column="1" 
+                           Margin="10,20"
+                           FontSize="{StaticResource WD.MediumFontSize}">
+                    <Run Foreground="{StaticResource WD.PrimaryTextSolidColorBrush}">
+                        WPF开发者
+                    </Run>
+                    <Run Foreground="{StaticResource WD.SuccessPressedSolidColorBrush}">正在直播</Run>
+                </TextBlock>
+                <Button Style="{StaticResource WD.PrimaryButton}" Grid.Column="1" 
+                        HorizontalAlignment="Right" 
+                        VerticalAlignment="Bottom" Content="进入直播" />
+            </Grid>
+        </Border>
+    </UniformGrid>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/BreatheLightExample.xaml" CodeType="Xaml" />
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/BreatheLightExample.xaml.cs" CodeType="CSharp" />
+            <controls:SourceCodeModel 
+                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/BreatheLightExample.xaml" 
+                CodeType="Xaml"/>
+            <controls:SourceCodeModel 
+                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/BreatheLightExample.xaml.cs" 
+                CodeType="CSharp"/>
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/BubblleControlExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/BubblleControlExample.xaml
index ce14c814..76b3fd87 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/BubblleControlExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/BubblleControlExample.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
              xmlns:sys="clr-namespace:System;assembly=mscorlib"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
@@ -13,8 +13,8 @@
     <controls:CodeViewer>
         <TabControl TabStripPlacement="Bottom">
             <TabItem Header="随机">
-                <wd:BubblleControl x:Name="MyBubblleControl"  Click="BubblleControl_Click">
-                    <wd:BubblleControl.ItemsSource>
+                <wpfdev:BubblleControl x:Name="MyBubblleControl"  Click="BubblleControl_Click">
+                    <wpfdev:BubblleControl.ItemsSource>
                         <x:Array Type="sys:String">
                             <sys:String>WPF</sys:String>
                             <sys:String>ASP.NET</sys:String>
@@ -26,11 +26,11 @@
                             <sys:String>WinForm</sys:String>
                             <sys:String>UWP</sys:String>
                         </x:Array>
-                    </wd:BubblleControl.ItemsSource>
-                </wd:BubblleControl>
+                    </wpfdev:BubblleControl.ItemsSource>
+                </wpfdev:BubblleControl>
             </TabItem>
             <TabItem Header="自定义">
-                <wd:BubblleCanvas Width="400" Height="400">
+                <wpfdev:BubblleCanvas Width="400" Height="400">
                     <Grid>
                         <Grid Width="60" 
                               Height="60">
@@ -94,7 +94,7 @@
                             </Hyperlink>
                         </TextBlock>
                     </Grid>
-                </wd:BubblleCanvas>
+                </wpfdev:BubblleCanvas>
             </TabItem>
         </TabControl>
         <controls:CodeViewer.SourceCodes>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CarouselExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CarouselExample.xaml
index 198b3012..7e18545e 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CarouselExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CarouselExample.xaml
@@ -4,18 +4,18 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wd:MasterCarousel IsStartAinimation="True" PlaySpeed="5000">
+        <wpfdev:MasterCarousel IsStartAinimation="True" PlaySpeed="5000">
             <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Craouse/0.jpg"/>
             <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Craouse/1.jpg"/>
             <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Craouse/2.jpg"/>
             <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Craouse/3.jpg"/>
             <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Craouse/4.jpg"/>
-        </wd:MasterCarousel>
+        </wpfdev:MasterCarousel>
             <controls:CodeViewer.SourceCodes>
                 <controls:SourceCodeModel 
                 CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CarouselExample.xaml" 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CarouselExampleEx.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CarouselExampleEx.xaml
index 2fbca0dd..ba630181 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CarouselExampleEx.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CarouselExampleEx.xaml
@@ -4,18 +4,18 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wd:EmphasizerCarousel>
+        <wpfdev:EmphasizerCarousel>
             <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Craouse/0.jpg"/>
             <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Craouse/1.jpg"/>
             <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Craouse/2.jpg"/>
             <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Craouse/3.jpg"/>
             <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Craouse/4.jpg"/>
-        </wd:EmphasizerCarousel>
+        </wpfdev:EmphasizerCarousel>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel 
                 CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/CarouselExampleEx.xaml" 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml
deleted file mode 100644
index 20485c13..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartBarExample.xaml
+++ /dev/null
@@ -1,52 +0,0 @@
-<UserControl
-    x:Class="WPFDevelopers.Samples.ExampleViews.ChartBarExample"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    <controls:CodeViewer>
-        <Grid Background="{DynamicResource WD.BackgroundSolidColorBrush}">
-            <Border
-                Height="500"
-                Margin="30,0"
-                Background="{DynamicResource WD.BackgroundSolidColorBrush}">
-                <Grid Margin="20,10">
-                    <Grid.RowDefinitions>
-                        <RowDefinition Height="40" />
-                        <RowDefinition />
-                        <RowDefinition Height="auto" />
-                    </Grid.RowDefinitions>
-                    <WrapPanel HorizontalAlignment="Right">
-                        <Rectangle
-                            Width="6"
-                            Height="26"
-                            Fill="Black" />
-                        <TextBlock
-                            Padding="10,0"
-                            FontSize="24"
-                            FontWeight="Black"
-                            Text="{Binding KeyBarChart, RelativeSource={RelativeSource AncestorType=local:ChartBarExample}}" />
-                    </WrapPanel>
-                    <wd:ChartBar Grid.Row="1" Datas="{Binding SeriesModels, RelativeSource={RelativeSource AncestorType=local:ChartBarExample}}" />
-                    <Button
-                        Grid.Row="2"
-                        Width="200"
-                        VerticalAlignment="Bottom"
-                        Click="Button_Click"
-                        Content="刷新"
-                        Style="{StaticResource WD.PrimaryButton}" />
-                </Grid>
-            </Border>
-        </Grid>
-        <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ChartBarExample.xaml" CodeType="Xaml" />
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ChartBarExample.xaml.cs" CodeType="CSharp" />
-        </controls:CodeViewer.SourceCodes>
-    </controls:CodeViewer>
-</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml
deleted file mode 100644
index 26a69c63..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml
+++ /dev/null
@@ -1,40 +0,0 @@
-<UserControl
-    x:Class="WPFDevelopers.Samples.ExampleViews.ChartLineExample"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    <controls:CodeViewer>
-        <Grid Background="{DynamicResource WD.BackgroundSolidColorBrush}">
-            <Grid.RowDefinitions>
-                <RowDefinition />
-                <RowDefinition Height="Auto" />
-            </Grid.RowDefinitions>
-            <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
-                <Border
-                    Height="500"
-                    Margin="30,0"
-                    Background="{DynamicResource WD.BackgroundSolidColorBrush}">
-                    <wd:ChartLine Datas="{Binding Datas, RelativeSource={RelativeSource AncestorType=local:ChartLineExample}}" />
-                </Border>
-            </ScrollViewer>
-            <Button
-                Grid.Row="1"
-                Width="200"
-                VerticalAlignment="Bottom"
-                Click="Button_Click"
-                Content="刷新"
-                Style="{StaticResource WD.PrimaryButton}" />
-        </Grid>
-        <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ChartLineExample.xaml" CodeType="Xaml" />
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ChartLineExample.xaml.cs" CodeType="CSharp" />
-        </controls:CodeViewer.SourceCodes>
-    </controls:CodeViewer>
-</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml.cs
deleted file mode 100644
index 6da42b8a..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartLineExample.xaml.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-
-namespace WPFDevelopers.Samples.ExampleViews
-{
-    /// <summary>
-    /// ChartLineExample.xaml 的交互逻辑
-    /// </summary>
-    public partial class ChartLineExample : UserControl
-    {
-        public IEnumerable<KeyValuePair<string, double>> Datas
-        {
-            get { return (IEnumerable<KeyValuePair<string, double>>)GetValue(DatasProperty); }
-            set { SetValue(DatasProperty, value); }
-        }
-
-        public static readonly DependencyProperty DatasProperty =
-            DependencyProperty.Register("Datas", typeof(IEnumerable<KeyValuePair<string, double>>), typeof(ChartLineExample), new PropertyMetadata(null));
-
-        private Dictionary<string, IEnumerable<KeyValuePair<string, double>>> keyValues = new Dictionary<string, IEnumerable<KeyValuePair<string, double>>>();
-        private int _index = 0;
-        public ChartLineExample()
-        {
-            InitializeComponent();
-            var models1 = new[]
-            {
-                new KeyValuePair<string, double>("Mon", 120),
-                new KeyValuePair<string, double>("Tue", 530),
-                new KeyValuePair<string, double>("Wed", 1060),
-                new KeyValuePair<string, double>("Thu", 140),
-                new KeyValuePair<string, double>("Fri", 8000) ,
-                new KeyValuePair<string, double>("Sat", 200) ,
-                new KeyValuePair<string, double>("Sun", 300) ,
-            };
-            var models2 = new[]
-            {
-                new KeyValuePair<string, double>("（1）月", 120),
-                new KeyValuePair<string, double>("（2）月", 170),
-                new KeyValuePair<string, double>("（3）月", 30),
-                new KeyValuePair<string, double>("（4）月", 200),
-                new KeyValuePair<string, double>("（5）月", 100) ,
-                new KeyValuePair<string, double>("（6）月", 180) ,
-                new KeyValuePair<string, double>("（7）月", 90) ,
-            };
-            keyValues.Add("1", models1);
-            keyValues.Add("2", models2);
-            Datas = models1;
-        }
-
-        private void Button_Click(object sender, RoutedEventArgs e)
-        {
-            _index++;
-            if (_index >= keyValues.Count)
-            {
-                _index = 0;
-            }
-            Datas = keyValues.ToList()[_index].Value;
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml
index 45552b88..6ea48ee2 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ChatEmojiExample.xaml
@@ -6,7 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
@@ -87,7 +87,7 @@
                             <ColumnDefinition />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <TextBox x:Name="LeftInput" wd:ElementHelper.Watermark="请输入内容" />
+                        <TextBox x:Name="LeftInput" wpfdev:ElementHelper.Watermark="请输入内容" />
                         <Button
                             x:Name="LeftSend"
                             Grid.Column="1"
@@ -173,7 +173,7 @@
                             <ColumnDefinition />
                             <ColumnDefinition Width="Auto" />
                         </Grid.ColumnDefinitions>
-                        <TextBox x:Name="RightInput" wd:ElementHelper.Watermark="请输入内容" />
+                        <TextBox x:Name="RightInput" wpfdev:ElementHelper.Watermark="请输入内容" />
                         <Button
                             x:Name="RightSend"
                             Grid.Column="1"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularMenuExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularMenuExample.xaml
index 854f13d5..8eeda5c1 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularMenuExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularMenuExample.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
@@ -13,7 +13,7 @@
         <TextBlock Text="微信公众号：WPFDevelopers" FontSize="40"
                            Foreground="#A9CC32" FontWeight="Bold"
                            Margin="50,10,0,20"/>
-        <wd:CircularMenu ItemsSource="{Binding MenuArray,RelativeSource={RelativeSource AncestorType=local:CircularMenuExample}}" 
+        <wpfdev:CircularMenu ItemsSource="{Binding MenuArray,RelativeSource={RelativeSource AncestorType=local:CircularMenuExample}}" 
                              SelectionChanged="CircularMenu_SelectionChanged"/>
     </StackPanel>
         <controls:CodeViewer.SourceCodes>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml
index 7b8f195d..c06727a6 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CircularProgressBarExample.xaml
@@ -4,32 +4,32 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
         <UniformGrid>
-            <wd:CircularProgressBar Background="#21BA9D"
+            <wpfdev:CircularProgressBar Background="#21BA9D"
                                        Value="{Binding ElementName=CirularSlider,Path=Value}"
                                        BrushStrokeThickness="2"
                                        StrokeThickness="3"
                                        Size="20,30"
                                        BorderBrush="LightGray"/>
 
-            <wd:CircularProgressBar Background="#E14D5F" 
+            <wpfdev:CircularProgressBar Background="#E14D5F" 
                                         Value="{Binding ElementName=CirularSlider,Path=Value}"
                                        BrushStrokeThickness="4"
                                        StrokeThickness="5"
                                        Size="15,15"
                                         BorderBrush="#42ABAC" />
-            <wd:CircularProgressBar Background="#1FA7FC" 
+            <wpfdev:CircularProgressBar Background="#1FA7FC" 
                                        BorderBrush="#D6D6D6" 
                                        Value="{Binding ElementName=CirularSlider,Path=Value}"
                                        BrushStrokeThickness="10"
                                        StrokeThickness="10"
                                        Foreground="Black"/>
-            <wd:CircularProgressBar Value="{Binding ElementName=CirularSlider,Path=Value}"/>
+            <wpfdev:CircularProgressBar Value="{Binding ElementName=CirularSlider,Path=Value}"/>
 
             <Slider Minimum="0" Maximum="100" 
                     x:Name="CirularSlider" IsSnapToTickEnabled="True"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CropAvatar/CropAvatarExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CropAvatar/CropAvatarExample.xaml
index ea8377ba..6161bf3f 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CropAvatar/CropAvatarExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CropAvatar/CropAvatarExample.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CropAvatar/CropAvatarWindow.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CropAvatar/CropAvatarWindow.xaml
index 9335491e..94de8aea 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CropAvatar/CropAvatarWindow.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CropAvatar/CropAvatarWindow.xaml
@@ -1,9 +1,9 @@
-<wd:Window x:Class="WPFDevelopers.Samples.ExampleViews.CropAvatarWindow"
+<wpfdev:Window x:Class="WPFDevelopers.Samples.ExampleViews.CropAvatarWindow"
                xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
                xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-               xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+               xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
                mc:Ignorable="d"  WindowStyle="ToolWindow" ResizeMode="NoResize"
                WindowStartupLocation="CenterScreen"
                Title="WPF 开发者-头像选择器" Height="450" Width="800">
@@ -16,7 +16,7 @@
             <RowDefinition/>
             <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
-        <wd:CropAvatar x:Name="MyCropAvatar"/>
+        <wpfdev:CropAvatar x:Name="MyCropAvatar"/>
         <Image Grid.Column="1" Name="CropAvatarImage" Source="{Binding ElementName=MyCropAvatar,Path=OutImageSource}" 
                Stretch="Fill" Width="200" Height="200">
             <Image.Clip>
@@ -30,4 +30,4 @@
             <Button  Content="关闭" Click="btnClose_Click" Margin="4,0"/>
         </UniformGrid>
     </Grid>
-</wd:Window>
+</wpfdev:Window>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/CutImageExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/CutImageExample.xaml
index 6a427b6b..1bfaad04 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/CutImageExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/CutImageExample.xaml
@@ -6,7 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ElementAdorner.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ElementAdorner.cs
deleted file mode 100644
index 2bf60451..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ElementAdorner.cs
+++ /dev/null
@@ -1,301 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Shapes;
-using WPFDevelopers.Helpers;
-
-namespace WPFDevelopers.Samples.ExampleViews
-{
-    public class ElementAdorner : Adorner
-    {
-        private const double ThumbSize = 16, ElementMiniSize = 20;
-        private const double RotateThumbSize = 20;
-        private readonly Thumb tLeft;
-        private readonly Thumb tRight;
-        private readonly Thumb bLeftBottom;
-        private readonly Thumb bRightBottom;
-        private readonly Thumb tMove;
-        private readonly VisualCollection visualCollection;
-        private readonly Thumb tRotate;
-
-        private Canvas canvas;
-        private Point centerPoint;
-        private FrameworkElement designerItem;
-        private double initialAngle;
-        private RotateTransform rotateTransform;
-        private Vector startVector;
-        public ElementAdorner(UIElement adornedElement) : base(adornedElement)
-        {
-            visualCollection = new VisualCollection(this);
-            visualCollection.Add(tMove = CreateMoveThumb());
-            visualCollection.Add(tLeft = CreateThumb(Cursors.SizeNWSE, HorizontalAlignment.Left,
-                VerticalAlignment.Top));
-            visualCollection.Add(tRight =
-                CreateThumb(Cursors.SizeNESW, HorizontalAlignment.Right, VerticalAlignment.Top));
-            visualCollection.Add(bLeftBottom =
-                CreateThumb(Cursors.SizeNESW, HorizontalAlignment.Left, VerticalAlignment.Bottom));
-            visualCollection.Add(bRightBottom =
-                CreateThumb(Cursors.SizeNWSE, HorizontalAlignment.Right, VerticalAlignment.Bottom));
-            visualCollection.Add(tRotate = CreateRotateThumb());
-        }
-
-        protected override int VisualChildrenCount => visualCollection.Count;
-
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            var offset = ThumbSize / 2;
-            var sz = new Size(ThumbSize, ThumbSize);
-            var renderPen = new Pen(ControlsHelper.PrimaryNormalBrush, 2.0);
-            var startPoint = new Point(AdornedElement.RenderSize.Width / 2,
-                AdornedElement.RenderSize.Height - AdornedElement.RenderSize.Height);
-            var endPoint = new Point(AdornedElement.RenderSize.Width / 2,
-                AdornedElement.RenderSize.Height - AdornedElement.RenderSize.Height - 16);
-            drawingContext.DrawLine(renderPen, startPoint, endPoint);
-            tMove.Arrange(new Rect(new Point(0, 0), new Size(RenderSize.Width, RenderSize.Height)));
-            tLeft.Arrange(new Rect(new Point(-offset, -offset), sz));
-            tRight.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width - offset, -offset), sz));
-            bLeftBottom.Arrange(new Rect(new Point(-offset, AdornedElement.RenderSize.Height - offset), sz));
-            bRightBottom.Arrange(new Rect(
-                new Point(AdornedElement.RenderSize.Width - offset, AdornedElement.RenderSize.Height - offset), sz));
-            tRotate.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width / 2 - 10, -(RotateThumbSize - 5)), new Size(20, 20)));
-
-            var adornedElementRect = new Rect(AdornedElement.RenderSize);
-            var pen = new Pen(ControlsHelper.Brush, 2);
-            drawingContext.DrawRectangle(null, pen, adornedElementRect);
-        }
-
-        private Thumb CreateMoveThumb()
-        {
-            var thumb = new Thumb
-            {
-                Cursor = Cursors.SizeAll,
-                Template = new ControlTemplate(typeof(Thumb))
-                {
-                    VisualTree = GetFactory(GetMoveEllipse())
-                }
-            };
-            thumb.DragDelta += (s, e) =>
-            {
-                var element = AdornedElement as FrameworkElement;
-                if (element == null)
-                    return;
-
-                var transform = element.RenderTransform;
-                if (transform != null)
-                {
-                    if (transform as RotateTransform != null)
-                    {
-                        var rotateTransform = transform as RotateTransform;
-
-                        Point ptChange = rotateTransform.Transform(new Point(e.HorizontalChange, e.VerticalChange));
-
-                        SetPositon(element, Canvas.GetLeft(element) + ptChange.X, Canvas.GetTop(element) + ptChange.Y);
-                    }
-                    else
-                    {
-                        SetPositon(element, Canvas.GetLeft(element) + e.HorizontalChange, Canvas.GetTop(element) + e.VerticalChange);
-                    }
-                }
-
-            };
-            return thumb;
-        }
-
-        private Brush GetMoveEllipse()
-        {
-            return new DrawingBrush(new GeometryDrawing(Brushes.Transparent, null, null));
-        }
-
-        /// <summary>
-        ///     创建Thumb
-        /// </summary>
-        /// <param name="cursor">鼠标</param>
-        /// <param name="horizontal">水平</param>
-        /// <param name="vertical">垂直</param>
-        /// <returns></returns>
-        private Thumb CreateThumb(Cursor cursor, HorizontalAlignment horizontal, VerticalAlignment vertical)
-        {
-            var thumb = new Thumb
-            {
-                Cursor = cursor,
-                Width = ThumbSize,
-                Height = ThumbSize,
-                HorizontalAlignment = horizontal,
-                VerticalAlignment = vertical,
-                Template = new ControlTemplate(typeof(Thumb))
-                {
-                    VisualTree = GetFactory(ControlsHelper.PrimaryNormalBrush)
-                }
-            };
-
-            thumb.DragDelta += (s, e) =>
-            {
-                var element = AdornedElement as FrameworkElement;
-                if (element == null) return;
-                Resize(element);
-                switch (thumb.VerticalAlignment)
-                {
-                    case VerticalAlignment.Bottom:
-                        if (element.Height + e.VerticalChange > ElementMiniSize) element.Height += e.VerticalChange;
-                        break;
-                    case VerticalAlignment.Top:
-                        if (element.Height - e.VerticalChange > ElementMiniSize)
-                        {
-                            element.Height -= e.VerticalChange;
-                            Canvas.SetTop(element, Canvas.GetTop(element) + e.VerticalChange);
-                        }
-
-                        break;
-                }
-
-                switch (thumb.HorizontalAlignment)
-                {
-                    case HorizontalAlignment.Left:
-                        if (element.Width - e.HorizontalChange > ElementMiniSize)
-                        {
-                            element.Width -= e.HorizontalChange;
-                            Canvas.SetLeft(element, Canvas.GetLeft(element) + e.HorizontalChange);
-                        }
-
-                        break;
-                    case HorizontalAlignment.Right:
-                        if (element.Width + e.HorizontalChange > ElementMiniSize) element.Width += e.HorizontalChange;
-                        break;
-                }
-
-                e.Handled = true;
-            };
-            return thumb;
-        }
-
-        private void Resize(FrameworkElement fElement)
-        {
-            if (double.IsNaN(fElement.Width))
-                fElement.Width = fElement.RenderSize.Width;
-            if (double.IsNaN(fElement.Height))
-                fElement.Height = fElement.RenderSize.Height;
-        }
-
-        private FrameworkElementFactory GetFactory(Brush back)
-        {
-            var elementFactory = new FrameworkElementFactory(typeof(Ellipse));
-            elementFactory.SetValue(Shape.FillProperty, back);
-            return elementFactory;
-        }
-
-
-        protected override Visual GetVisualChild(int index)
-        {
-            return visualCollection[index];
-        }
-
-        private void SetPositon(FrameworkElement element, double left, double top)
-        {
-            var parent = VisualTreeHelper.GetParent(element) as Canvas;
-
-            if (left <= 0)
-            {
-                left = 0;
-            }
-
-            if (top <= 0)
-            {
-                top = 0;
-            }
-
-            if (left + element.Width > parent.ActualWidth)
-            {
-                left = parent.ActualWidth - element.Width;
-            }
-            if (top + element.Height > parent.ActualHeight)
-            {
-                top = parent.ActualHeight - element.Height;
-            }
-
-            Canvas.SetLeft(element, left);
-            Canvas.SetTop(element, top);
-        }
-        /// <summary>
-        /// 旋转
-        /// </summary>
-        /// <returns></returns>
-        private Thumb CreateRotateThumb()
-        {
-            Thumb thumb = new Thumb()
-            {
-                Cursor = Cursors.Hand,
-                Width = RotateThumbSize,
-                Height = RotateThumbSize,
-                VerticalAlignment = VerticalAlignment.Top,
-                Margin = new Thickness(0, -RotateThumbSize, 0, 0),
-                Template = new ControlTemplate(typeof(Thumb))
-                {
-                    VisualTree = GetFactory(GetFactoryRotate()),
-                },
-            };
-            thumb.DragDelta += Thumb_DragDelta;
-            thumb.DragStarted += Thumb_DragStarted;
-            return thumb;
-        }
-
-
-        private Brush GetFactoryRotate()
-        {
-            var lan =
-                "M242 842l60-60c48 36 106 60 168 68v86c-86-8-164-42-228-94zM554 850c62-8 120-32 166-68l62 60c-64 52-142 86-228 94v-86zM782 722c36-48 60-104 68-166h86c-8 86-42 162-94 226zM640 512c0 70-58 128-128 128s-128-58-128-128 58-128 128-128 128 58 128 128zM174 554c8 62 32 120 68 166l-60 62c-52-64-86-142-94-228h86zM242 302c-36 48-60 106-68 168h-86c8-86 42-164 94-228zM850 470c-8-62-32-120-68-168l60-60c52 64 86 142 94 228h-86zM782 182l-60 60c-48-36-106-60-168-68v-86c86 8 164 42 228 94zM470 174c-62 8-120 32-168 68l-60-60c64-52 142-86 228-94v86z";
-            var converter = TypeDescriptor.GetConverter(typeof(Geometry));
-            var geometry = (Geometry)converter.ConvertFrom(lan);
-            TileBrush bsh =
-                new DrawingBrush(new GeometryDrawing(ControlsHelper.PrimaryNormalBrush, new Pen(Brushes.Transparent, 2), geometry));
-            bsh.Stretch = Stretch.Fill;
-            return bsh;
-        }
-        private void Thumb_DragDelta(object sender, DragDeltaEventArgs e)
-        {
-            if (designerItem != null && canvas != null)
-            {
-                var currentPoint = Mouse.GetPosition(canvas);
-                var deltaVector = Point.Subtract(currentPoint, centerPoint);
-
-                var angle = Vector.AngleBetween(startVector, deltaVector);
-
-                var rotateTransform = designerItem.RenderTransform as RotateTransform;
-                rotateTransform.Angle = initialAngle + Math.Round(angle, 0);
-                designerItem.InvalidateMeasure();
-            }
-        }
-
-        private void Thumb_DragStarted(object sender, DragStartedEventArgs e)
-        {
-            var thumb = sender as Thumb;
-            designerItem = AdornedElement as FrameworkElement;
-            canvas = VisualTreeHelper.GetParent(designerItem) as Canvas;
-            if (canvas != null)
-            {
-                centerPoint = designerItem.TranslatePoint(
-                    new Point(designerItem.Width * designerItem.RenderTransformOrigin.X,
-                        designerItem.Height * designerItem.RenderTransformOrigin.Y),
-                    canvas);
-
-                var startPoint = Mouse.GetPosition(canvas);
-                startVector = Point.Subtract(startPoint, centerPoint);
-
-                rotateTransform = designerItem.RenderTransform as RotateTransform;
-                if (rotateTransform == null)
-                {
-                    designerItem.RenderTransform = new RotateTransform(0);
-                    initialAngle = 0;
-                }
-                else
-                {
-                    initialAngle = rotateTransform.Angle;
-                }
-            }
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAdorner.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAdorner.cs
deleted file mode 100644
index f535a0f4..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAdorner.cs
+++ /dev/null
@@ -1,418 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Shapes;
-using WPFDevelopers.Helpers;
-
-namespace WPFDevelopers.Samples.ExampleViews
-{
-    public class ThumbAdorner : Adorner
-    {
-        private const double THUMB_SIZE = 5;
-        private const double MINIMAL_SIZE = 20;
-        private const double RotateThumbSize = 20;
-        private readonly Thumb lc;
-        private readonly Thumb tl;
-        private readonly Thumb tc;
-        private readonly Thumb tr;
-        private readonly Thumb rc;
-        private readonly Thumb br;
-        private readonly Thumb bc;
-        private readonly Thumb bl;
-        private readonly Thumb tMove;
-        private readonly Thumb tRotate;
-        private readonly VisualCollection visCollec;
-        private Canvas canvas;
-        private readonly FrameworkElement child;
-        private Point centerPoint;
-        private FrameworkElement designerItem;
-        private double initialAngle;
-        private RotateTransform rotateTransform;
-        private Vector startVector;
-        private TransformThumb parentElemt;
-
-        public ThumbAdorner(UIElement adorned) : base(adorned)
-        {
-            canvas = FindParent(adorned) as Canvas;
-            child = FindVisualChild<Rectangle>(adorned);
-            parentElemt = adorned as TransformThumb;
-            visCollec = new VisualCollection(this);
-            // 创建移动
-            visCollec.Add(tMove = CreateMoveThumb());
-            visCollec.Add(lc = GetResizeThumb(Cursors.SizeWE, HorizontalAlignment.Left, VerticalAlignment.Center));
-            visCollec.Add(tl = GetResizeThumb(Cursors.SizeNWSE, HorizontalAlignment.Left, VerticalAlignment.Top));
-            visCollec.Add(tc = GetResizeThumb(Cursors.SizeNS, HorizontalAlignment.Center, VerticalAlignment.Top));
-            visCollec.Add(tr = GetResizeThumb(Cursors.SizeNESW, HorizontalAlignment.Right, VerticalAlignment.Top));
-            visCollec.Add(rc = GetResizeThumb(Cursors.SizeWE, HorizontalAlignment.Right, VerticalAlignment.Center));
-            visCollec.Add(br = GetResizeThumb(Cursors.SizeNWSE, HorizontalAlignment.Right, VerticalAlignment.Bottom));
-            visCollec.Add(bc = GetResizeThumb(Cursors.SizeNS, HorizontalAlignment.Center, VerticalAlignment.Bottom));
-            visCollec.Add(bl = GetResizeThumb(Cursors.SizeNESW, HorizontalAlignment.Left, VerticalAlignment.Bottom));
-            visCollec.Add(tRotate = CreateRotateThumb());
-        }
-
-        protected override int VisualChildrenCount => visCollec.Count;
-
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            var offset = THUMB_SIZE / 2;
-            var sz = new Size(THUMB_SIZE, THUMB_SIZE);
-            var renderPen = new Pen(ControlsHelper.PrimaryNormalBrush, 2.0);
-            var startPoint = new Point(AdornedElement.RenderSize.Width / 2,
-                AdornedElement.RenderSize.Height - AdornedElement.RenderSize.Height);
-            var endPoint = new Point(AdornedElement.RenderSize.Width / 2,
-                AdornedElement.RenderSize.Height - AdornedElement.RenderSize.Height - 16);
-            drawingContext.DrawLine(renderPen, startPoint, endPoint);
-            tMove.Arrange(new Rect(new Point(0, 0), new Size(RenderSize.Width, RenderSize.Height)));
-
-            lc.Arrange(new Rect(new Point(-offset, AdornedElement.RenderSize.Height / 2 - offset), sz));
-            tl.Arrange(new Rect(new Point(-offset, -offset), sz));
-            tc.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width / 2 - offset, -offset), sz));
-            tr.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width - offset, -offset), sz));
-            rc.Arrange(new Rect(
-                new Point(AdornedElement.RenderSize.Width - offset, AdornedElement.RenderSize.Height / 2 - offset),
-                sz));
-            br.Arrange(new Rect(
-                new Point(AdornedElement.RenderSize.Width - offset, AdornedElement.RenderSize.Height - offset), sz));
-            bc.Arrange(new Rect(
-                new Point(AdornedElement.RenderSize.Width / 2 - offset, AdornedElement.RenderSize.Height - offset),
-                sz));
-            bl.Arrange(new Rect(new Point(-offset, AdornedElement.RenderSize.Height - offset), sz));
-
-            tRotate.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width / 2 - 10, -(RotateThumbSize - 5)), new Size(20, 20)));
-
-        }
-
-
-        private Thumb CreateMoveThumb()
-        {
-            var thumb = new Thumb
-            {
-                Cursor = Cursors.SizeAll,
-                Template = new ControlTemplate(typeof(Thumb))
-                {
-                    VisualTree = GetFactory(GetMoveEllipse())
-                }
-            };
-
-            thumb.DragDelta += (s, e) =>
-            {
-                var element = AdornedElement as FrameworkElement;
-                if (element == null)
-                    return;
-
-                var transform = element.RenderTransform;
-                if (transform != null)
-                {
-                    if (transform as RotateTransform != null)
-                    {
-                        var rotateTransform = transform as RotateTransform;
-
-                        Point ptChange = rotateTransform.Transform(new Point(e.HorizontalChange, e.VerticalChange));
-
-                        SetPositon(element, Canvas.GetLeft(element) + ptChange.X, Canvas.GetTop(element) + ptChange.Y);
-                    }
-                    else
-                    {
-                        SetPositon(element, Canvas.GetLeft(element) + e.HorizontalChange, Canvas.GetTop(element) + e.VerticalChange);
-                    }
-                }
-
-            };
-            return thumb;
-        }
-
-        private void SetPositon(FrameworkElement element, double left, double top)
-        {
-            var parent = VisualTreeHelper.GetParent(element) as Canvas;
-
-            if (left <= 0)
-            {
-                left = 0;
-            }
-
-            if (top <= 0)
-            {
-                top = 0;
-            }
-
-            if (left + element.Width > parent.ActualWidth)
-            {
-                left = parent.ActualWidth - element.Width;
-            }
-            if (top + element.Height > parent.ActualHeight)
-            {
-                top = parent.ActualHeight - element.Height;
-            }
-
-            Canvas.SetLeft(element, left);
-            Canvas.SetTop(element, top);
-        }
-
-        private Brush GetMoveEllipse()
-        {
-            return new DrawingBrush(new GeometryDrawing(Brushes.Transparent, null, null));
-        }
-
-        /// <summary>
-        /// 旋转
-        /// </summary>
-        /// <returns></returns>
-        private Thumb CreateRotateThumb()
-        {
-            Thumb thumb = new Thumb()
-            {
-                Cursor = Cursors.ScrollAll,
-                Width = RotateThumbSize,
-                Height = RotateThumbSize,
-                VerticalAlignment = VerticalAlignment.Top,
-                Margin = new Thickness(0, -RotateThumbSize, 0, 0),
-                Template = new ControlTemplate(typeof(Thumb))
-                {
-                    VisualTree = GetEllipseFactory(GetFactoryRotate()),
-                },
-            };
-            thumb.DragDelta += Thumb_DragDelta;
-            thumb.DragStarted += Thumb_DragStarted;
-            return thumb;
-        }
-
-        private FrameworkElementFactory GetEllipseFactory(Brush back)
-        {
-            var elementFactory = new FrameworkElementFactory(typeof(Ellipse));
-            elementFactory.SetValue(Shape.FillProperty, back);
-            return elementFactory;
-        }
-
-        private Brush GetFactoryRotate()
-        {
-            var lan =
-                "M242 842l60-60c48 36 106 60 168 68v86c-86-8-164-42-228-94zM554 850c62-8 120-32 166-68l62 60c-64 52-142 86-228 94v-86zM782 722c36-48 60-104 68-166h86c-8 86-42 162-94 226zM640 512c0 70-58 128-128 128s-128-58-128-128 58-128 128-128 128 58 128 128zM174 554c8 62 32 120 68 166l-60 62c-52-64-86-142-94-228h86zM242 302c-36 48-60 106-68 168h-86c8-86 42-164 94-228zM850 470c-8-62-32-120-68-168l60-60c52 64 86 142 94 228h-86zM782 182l-60 60c-48-36-106-60-168-68v-86c86 8 164 42 228 94zM470 174c-62 8-120 32-168 68l-60-60c64-52 142-86 228-94v86z";
-            var converter = TypeDescriptor.GetConverter(typeof(Geometry));
-            var geometry = (Geometry)converter.ConvertFrom(lan);
-            TileBrush bsh =
-                new DrawingBrush(new GeometryDrawing(ControlsHelper.PrimaryNormalBrush, new Pen(Brushes.Transparent, 2), geometry));
-            bsh.Stretch = Stretch.Fill;
-            return bsh;
-        }
-
-        private void Thumb_DragDelta(object sender, DragDeltaEventArgs e)
-        {
-            if (designerItem != null && canvas != null)
-            {
-                var currentPoint = Mouse.GetPosition(canvas);
-                var deltaVector = Point.Subtract(currentPoint, centerPoint);
-
-                var angle = Vector.AngleBetween(startVector, deltaVector);
-
-                var rotateTransform = designerItem.RenderTransform as RotateTransform;
-                rotateTransform.Angle = initialAngle + Math.Round(angle, 0);
-                designerItem.InvalidateMeasure();
-            }
-        }
-
-        private void Thumb_DragStarted(object sender, DragStartedEventArgs e)
-        {
-            var thumb = sender as Thumb;
-            designerItem = AdornedElement as FrameworkElement;
-            canvas = VisualTreeHelper.GetParent(designerItem) as Canvas;
-            if (canvas != null)
-            {
-                centerPoint = designerItem.TranslatePoint(
-                    new Point(designerItem.Width * designerItem.RenderTransformOrigin.X,
-                        designerItem.Height * designerItem.RenderTransformOrigin.Y),
-                    canvas);
-
-                var startPoint = Mouse.GetPosition(canvas);
-                startVector = Point.Subtract(startPoint, centerPoint);
-
-                rotateTransform = designerItem.RenderTransform as RotateTransform;
-                if (rotateTransform == null)
-                {
-                    designerItem.RenderTransform = new RotateTransform(0);
-                    initialAngle = 0;
-                }
-                else
-                {
-                    initialAngle = rotateTransform.Angle;
-                }
-            }
-        }
-
-        private static UIElement FindParent(UIElement element)
-        {
-            DependencyObject obj = element;
-            obj = VisualTreeHelper.GetParent(obj);
-            return obj as UIElement;
-        }
-
-        private childItem FindVisualChild<childItem>(DependencyObject obj)
-    where childItem : DependencyObject
-        {
-            for (int i = 0; i < VisualTreeHelper.GetChildrenCount(obj); i++)
-            {
-                DependencyObject child = VisualTreeHelper.GetChild(obj, i);
-                if (child != null && child is childItem)
-                {
-                    return (childItem)child;
-                }
-                else
-                {
-                    ContentPresenter element = child as ContentPresenter;
-                    if (element != null && element.Content is childItem)
-                    {
-                        return (childItem)element.Content;
-                    }
-                }
-            }
-            return null;
-        }
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            var offset = THUMB_SIZE / 2;
-            var sz = new Size(THUMB_SIZE, THUMB_SIZE);
-            lc.Arrange(new Rect(new Point(-offset, AdornedElement.RenderSize.Height / 2 - offset), sz));
-            tl.Arrange(new Rect(new Point(-offset, -offset), sz));
-            tc.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width / 2 - offset, -offset), sz));
-            tr.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width - offset, -offset), sz));
-            rc.Arrange(new Rect(
-                new Point(AdornedElement.RenderSize.Width - offset, AdornedElement.RenderSize.Height / 2 - offset),
-                sz));
-            br.Arrange(new Rect(
-                new Point(AdornedElement.RenderSize.Width - offset, AdornedElement.RenderSize.Height - offset), sz));
-            bc.Arrange(new Rect(
-                new Point(AdornedElement.RenderSize.Width / 2 - offset, AdornedElement.RenderSize.Height - offset),
-                sz));
-            bl.Arrange(new Rect(new Point(-offset, AdornedElement.RenderSize.Height - offset), sz));
-            return finalSize;
-        }
-
-        private void Resize(FrameworkElement frameworkElement)
-        {
-            if (double.IsNaN(frameworkElement.Width))
-                frameworkElement.Width = frameworkElement.RenderSize.Width;
-            if (double.IsNaN(frameworkElement.Height))
-                frameworkElement.Height = frameworkElement.RenderSize.Height;
-            child.Width = frameworkElement.RenderSize.Width;
-            child.Height = frameworkElement.RenderSize.Height;
-        }
-
-        private Thumb GetResizeThumb(Cursor cur, HorizontalAlignment hor, VerticalAlignment ver)
-        {
-            // 设置拖拽控件实例
-            var thumb = new Thumb
-            {
-                Width = THUMB_SIZE,
-                Height = THUMB_SIZE,
-                HorizontalAlignment = hor,
-                VerticalAlignment = ver,
-                Cursor = cur,
-                Template = new ControlTemplate(typeof(Thumb))
-                {
-                    VisualTree = GetFactory(ControlsHelper.PrimaryNormalBrush)
-                }
-            };
-
-            // 最大宽度
-            var maxWidth = double.IsNaN(canvas.Width) ? canvas.ActualWidth : canvas.Width;
-            // 最大高度
-            var maxHeight = double.IsNaN(canvas.Height) ? canvas.ActualHeight : canvas.Height;
-            // 订阅拖拽开始事件
-            thumb.DragStarted += (s, e) => {
-                Debug.WriteLine($"HorizontalOffset:{e.HorizontalOffset}");
-                Debug.WriteLine($"VerticalOffset:{e.VerticalOffset}");
-            };
-            // 订阅拖拽事件
-            thumb.DragDelta += (s, e) =>
-            {
-                // 转换遮罩目标节点元素为基础元素节点
-                var element = AdornedElement as FrameworkElement;
-                if (element == null)
-                    return;
-                // 刷新节点大小
-                Resize(element);
-                // 判定拖动控件所属垂直位置
-                switch (thumb.VerticalAlignment)
-                {
-                    case VerticalAlignment.Bottom:
-                        if (element.Height + e.VerticalChange > MINIMAL_SIZE)
-                        {
-                            var newHeight = element.Height + e.VerticalChange;
-                            var top = Canvas.GetTop(element) + newHeight;
-                            if (newHeight > 0 && top <= canvas.ActualHeight)
-                                element.Height = newHeight;
-                        }
-                        break;
-
-                    case VerticalAlignment.Top:
-                        if (element.Height - e.VerticalChange > MINIMAL_SIZE)
-                        {
-
-                            var newHeight = element.Height - e.VerticalChange;
-                            var top = Canvas.GetTop(element);
-                            if (newHeight > 0 && top + e.VerticalChange >= 0)
-                            {
-                                element.Height = newHeight;
-                                Canvas.SetTop(element, top + e.VerticalChange);
-                            }
-                        }
-
-                        break;
-                }
-                // 判定拖动控件所属水平位置
-                switch (thumb.HorizontalAlignment)
-                {
-                    case HorizontalAlignment.Left:
-                        if (element.Width - e.HorizontalChange > MINIMAL_SIZE)
-                        {
-                            var newWidth = element.Width - e.HorizontalChange;
-                            var left = Canvas.GetLeft(element);
-                            if (newWidth > 0 && left + e.HorizontalChange >= 0)
-                            {
-                                element.Width = newWidth;
-                                Canvas.SetLeft(element, left + e.HorizontalChange);
-                            }
-                        }
-
-                        break;
-                    case HorizontalAlignment.Right:
-                        if (element.Width + e.HorizontalChange > MINIMAL_SIZE)
-                        {
-                            var newWidth = element.Width + e.HorizontalChange;
-                            var left = Canvas.GetLeft(element) + newWidth;
-                            if (newWidth > 0 && left <= canvas.ActualWidth)
-                                element.Width = newWidth;
-                        }
-
-                        break;
-                }
-
-                e.Handled = true;
-            };
-            thumb.DragCompleted += (s, e) => {
-                Debug.WriteLine($"HorizontalChange:{e.HorizontalChange}");
-                Debug.WriteLine($"VerticalChange:{e.VerticalChange}");
-            };
-            return thumb;
-        }
-
-        private FrameworkElementFactory GetFactory(Brush back)
-        {
-            var fef = new FrameworkElementFactory(typeof(Rectangle));
-            fef.SetValue(Shape.FillProperty, back);
-            fef.SetValue(Shape.StrokeProperty, ControlsHelper.PrimaryNormalBrush);
-            fef.SetValue(Shape.StrokeThicknessProperty, (double)1);
-            return fef;
-        }
-
-        protected override Visual GetVisualChild(int index)
-        {
-            return visCollec[index];
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAdorner2.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAdorner2.cs
deleted file mode 100644
index cbbea3a2..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAdorner2.cs
+++ /dev/null
@@ -1,404 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Shapes;
-using WPFDevelopers.Helpers;
-
-namespace WPFDevelopers.Samples.ExampleViews
-{
-    public class ThumbAdorner2 : Adorner
-    {
-        private const double THUMB_SIZE = 15;
-        private const double MINIMAL_SIZE = 20;
-        private const double RotateThumbSize = 20;
-        private readonly Thumb lc;
-        private readonly Thumb tl;
-        private readonly Thumb tc;
-        private readonly Thumb tr;
-        private readonly Thumb rc;
-        private readonly Thumb br;
-        private readonly Thumb bc;
-        private readonly Thumb bl;
-        private readonly VisualCollection visCollec;
-        private Canvas canvas;
-        private readonly Thumb tMove;
-        private readonly Thumb tRotate;
-        private readonly FrameworkElement child;
-        private Point centerPoint;
-        private FrameworkElement designerItem;
-        private double initialAngle;
-        private RotateTransform rotateTransform;
-        private Vector startVector;
-        private TransformThumb parentElemt;
-
-        public ThumbAdorner2(UIElement adorned) : base(adorned)
-        {
-            canvas = FindParent(adorned) as Canvas;
-            parentElemt = adorned as TransformThumb;
-            child = FindVisualChild(adorned);
-            visCollec = new VisualCollection(this);
-            // 创建移动
-            visCollec.Add(tMove = CreateMoveThumb());
-            visCollec.Add(lc = GetResizeThumb(Cursors.SizeWE, HorizontalAlignment.Left, VerticalAlignment.Center));
-            visCollec.Add(tl = GetResizeThumb(Cursors.SizeNWSE, HorizontalAlignment.Left, VerticalAlignment.Top));
-            visCollec.Add(tc = GetResizeThumb(Cursors.SizeNS, HorizontalAlignment.Center, VerticalAlignment.Top));
-            visCollec.Add(tr = GetResizeThumb(Cursors.SizeNESW, HorizontalAlignment.Right, VerticalAlignment.Top));
-            visCollec.Add(rc = GetResizeThumb(Cursors.SizeWE, HorizontalAlignment.Right, VerticalAlignment.Center));
-            visCollec.Add(br = GetResizeThumb(Cursors.SizeNWSE, HorizontalAlignment.Right, VerticalAlignment.Bottom));
-            visCollec.Add(bc = GetResizeThumb(Cursors.SizeNS, HorizontalAlignment.Center, VerticalAlignment.Bottom));
-            visCollec.Add(bl = GetResizeThumb(Cursors.SizeNESW, HorizontalAlignment.Left, VerticalAlignment.Bottom));
-            visCollec.Add(tRotate = CreateRotateThumb());
-        }
-        /// <summary>
-        /// 旋转
-        /// </summary>
-        /// <returns></returns>
-        private Thumb CreateRotateThumb()
-        {
-            Thumb thumb = new Thumb()
-            {
-                Cursor = Cursors.ScrollAll,
-                Width = RotateThumbSize,
-                Height = RotateThumbSize,
-                VerticalAlignment = VerticalAlignment.Top,
-                Margin = new Thickness(0, -RotateThumbSize, 0, 0),
-                Template = new ControlTemplate(typeof(Thumb))
-                {
-                    VisualTree = GetEllipseFactory(GetFactoryRotate()),
-                },
-            };
-            thumb.DragDelta += Thumb_DragDelta;
-            thumb.DragStarted += Thumb_DragStarted;
-            return thumb;
-        }
-
-        private void Thumb_DragDelta(object sender, DragDeltaEventArgs e)
-        {
-            if (designerItem != null && canvas != null)
-            {
-                var currentPoint = Mouse.GetPosition(canvas);
-                var deltaVector = Point.Subtract(currentPoint, centerPoint);
-
-                var angle = Vector.AngleBetween(startVector, deltaVector);
-
-                var rotateTransform = designerItem.RenderTransform as RotateTransform;
-                rotateTransform.Angle = initialAngle + Math.Round(angle, 0);
-                designerItem.InvalidateMeasure();
-            }
-        }
-
-        private void Thumb_DragStarted(object sender, DragStartedEventArgs e)
-        {
-            var thumb = sender as Thumb;
-            designerItem = AdornedElement as FrameworkElement;
-            canvas = VisualTreeHelper.GetParent(designerItem) as Canvas;
-            if (canvas != null)
-            {
-                centerPoint = designerItem.TranslatePoint(
-                    new Point(designerItem.Width * designerItem.RenderTransformOrigin.X,
-                        designerItem.Height * designerItem.RenderTransformOrigin.Y),
-                    canvas);
-
-                var startPoint = Mouse.GetPosition(canvas);
-                startVector = Point.Subtract(startPoint, centerPoint);
-
-                rotateTransform = designerItem.RenderTransform as RotateTransform;
-                if (rotateTransform == null)
-                {
-                    designerItem.RenderTransform = new RotateTransform(0);
-                    initialAngle = 0;
-                }
-                else
-                {
-                    initialAngle = rotateTransform.Angle;
-                }
-            }
-        }
-
-        private FrameworkElementFactory GetEllipseFactory(Brush back)
-        {
-            var elementFactory = new FrameworkElementFactory(typeof(Ellipse));
-            elementFactory.SetValue(Shape.FillProperty, back);
-            return elementFactory;
-        }
-
-        private FrameworkElementFactory GetContentFactory(Brush back)
-        {
-            var elementFactory = new FrameworkElementFactory(parentElemt.ContentType);
-            elementFactory.SetValue(Shape.FillProperty, back);
-            return elementFactory;
-        }
-        private Brush GetFactoryRotate()
-        {
-            var lan =
-                "M242 842l60-60c48 36 106 60 168 68v86c-86-8-164-42-228-94zM554 850c62-8 120-32 166-68l62 60c-64 52-142 86-228 94v-86zM782 722c36-48 60-104 68-166h86c-8 86-42 162-94 226zM640 512c0 70-58 128-128 128s-128-58-128-128 58-128 128-128 128 58 128 128zM174 554c8 62 32 120 68 166l-60 62c-52-64-86-142-94-228h86zM242 302c-36 48-60 106-68 168h-86c8-86 42-164 94-228zM850 470c-8-62-32-120-68-168l60-60c52 64 86 142 94 228h-86zM782 182l-60 60c-48-36-106-60-168-68v-86c86 8 164 42 228 94zM470 174c-62 8-120 32-168 68l-60-60c64-52 142-86 228-94v86z";
-            var converter = TypeDescriptor.GetConverter(typeof(Geometry));
-            var geometry = (Geometry)converter.ConvertFrom(lan);
-            TileBrush bsh =
-                new DrawingBrush(new GeometryDrawing(ControlsHelper.PrimaryNormalBrush, new Pen(Brushes.Transparent, 2), geometry));
-            bsh.Stretch = Stretch.Fill;
-            return bsh;
-        }
-        private Thumb CreateMoveThumb()
-        {
-            var thumb = new Thumb
-            {
-                Cursor = Cursors.SizeAll,
-                Template = new ControlTemplate(typeof(Thumb))
-                {
-                    VisualTree = GetContentFactory(GetMoveEllipse())
-                }
-            };
-
-            thumb.DragDelta += (s, e) =>
-            {
-                var element = AdornedElement as FrameworkElement;
-                if (element == null)
-                    return;
-
-                var transform = element.RenderTransform;
-                if (transform != null)
-                {
-                    if (transform as RotateTransform != null)
-                    {
-                        var rotateTransform = transform as RotateTransform;
-
-                        Point ptChange = rotateTransform.Transform(new Point(e.HorizontalChange, e.VerticalChange));
-
-                        SetPositon(element, Canvas.GetLeft(element) + ptChange.X, Canvas.GetTop(element) + ptChange.Y);
-                    }
-                    else
-                    {
-                        SetPositon(element, Canvas.GetLeft(element) + e.HorizontalChange, Canvas.GetTop(element) + e.VerticalChange);
-                    }
-                }
-
-            };
-            return thumb;
-        }
-
-        private void SetPositon(FrameworkElement element, double left, double top)
-        {
-            var parent = VisualTreeHelper.GetParent(element) as Canvas;
-
-            if (left <= 0)
-            {
-                left = 0;
-            }
-
-            if (top <= 0)
-            {
-                top = 0;
-            }
-
-            if (left + element.Width > parent.ActualWidth)
-            {
-                left = parent.ActualWidth - element.Width;
-            }
-            if (top + element.Height > parent.ActualHeight)
-            {
-                top = parent.ActualHeight - element.Height;
-            }
-
-            Canvas.SetLeft(element, left);
-            Canvas.SetTop(element, top);
-        }
-
-        private Brush GetMoveEllipse()
-        {
-            return new DrawingBrush(new GeometryDrawing(Brushes.Transparent, null, null));
-        }
-
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            var offset = THUMB_SIZE / 2;
-            var sz = new Size(THUMB_SIZE, THUMB_SIZE);
-            var renderPen = new Pen(ControlsHelper.PrimaryNormalBrush, 2.0);
-            var startPoint = new Point(AdornedElement.RenderSize.Width / 2,
-                AdornedElement.RenderSize.Height - AdornedElement.RenderSize.Height);
-            var endPoint = new Point(AdornedElement.RenderSize.Width / 2,
-                AdornedElement.RenderSize.Height - AdornedElement.RenderSize.Height - 16);
-            drawingContext.DrawLine(renderPen, startPoint, endPoint);
-            tMove.Arrange(new Rect(new Point(0, 0), new Size(RenderSize.Width, RenderSize.Height)));
-
-            lc.Arrange(new Rect(new Point(-offset, AdornedElement.RenderSize.Height / 2 - offset), sz));
-            tl.Arrange(new Rect(new Point(-offset, -offset), sz));
-            tc.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width / 2 - offset, -offset), sz));
-            tr.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width - offset, -offset), sz));
-            rc.Arrange(new Rect(
-                new Point(AdornedElement.RenderSize.Width - offset, AdornedElement.RenderSize.Height / 2 - offset),
-                sz));
-            br.Arrange(new Rect(
-                new Point(AdornedElement.RenderSize.Width - offset, AdornedElement.RenderSize.Height - offset), sz));
-            bc.Arrange(new Rect(
-                new Point(AdornedElement.RenderSize.Width / 2 - offset, AdornedElement.RenderSize.Height - offset),
-                sz));
-            bl.Arrange(new Rect(new Point(-offset, AdornedElement.RenderSize.Height - offset), sz));
-
-            tRotate.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width / 2 - 10, -(RotateThumbSize - 5)), new Size(20, 20)));
-
-            var adornedElementRect = new Rect(AdornedElement.RenderSize);
-            var pen = new Pen(ControlsHelper.Brush, 2);
-            drawingContext.DrawRectangle(null, pen, adornedElementRect);
-        }
-        private static UIElement FindParent(UIElement element)
-        {
-            DependencyObject obj = element;
-            obj = VisualTreeHelper.GetParent(obj);
-            return obj as UIElement;
-        }
-        private FrameworkElement FindVisualChild(DependencyObject obj)
-        {
-            for (int i = 0; i < VisualTreeHelper.GetChildrenCount(obj); i++)
-            {
-                DependencyObject child = VisualTreeHelper.GetChild(obj, i);
-                if (child != null && child.GetType() == parentElemt.ContentType)
-                {
-                    return (FrameworkElement)child;
-                }
-                else
-                {
-                    ContentPresenter element = child as ContentPresenter;
-                    if (element != null && element.Content.GetType() == parentElemt.ContentType)
-                    {
-                        return (FrameworkElement)element.Content;
-                    }
-                }
-            }
-            return null;
-        }
-        protected override int VisualChildrenCount => visCollec.Count;
-
-        protected override Size ArrangeOverride(Size finalSize)
-        {
-            var offset = THUMB_SIZE / 2;
-            var sz = new Size(THUMB_SIZE, THUMB_SIZE);
-            lc.Arrange(new Rect(new Point(-offset, AdornedElement.RenderSize.Height / 2 - offset), sz));
-            tl.Arrange(new Rect(new Point(-offset, -offset), sz));
-            tc.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width / 2 - offset, -offset), sz));
-            tr.Arrange(new Rect(new Point(AdornedElement.RenderSize.Width - offset, -offset), sz));
-            rc.Arrange(new Rect(
-                new Point(AdornedElement.RenderSize.Width - offset, AdornedElement.RenderSize.Height / 2 - offset),
-                sz));
-            br.Arrange(new Rect(
-                new Point(AdornedElement.RenderSize.Width - offset, AdornedElement.RenderSize.Height - offset), sz));
-            bc.Arrange(new Rect(
-                new Point(AdornedElement.RenderSize.Width / 2 - offset, AdornedElement.RenderSize.Height - offset),
-                sz));
-            bl.Arrange(new Rect(new Point(-offset, AdornedElement.RenderSize.Height - offset), sz));
-            return finalSize;
-        }
-
-        private void Resize(FrameworkElement frameworkElement)
-        {
-            if (double.IsNaN(frameworkElement.Width))
-                frameworkElement.Width = frameworkElement.RenderSize.Width;
-            if (double.IsNaN(frameworkElement.Height))
-                frameworkElement.Height = frameworkElement.RenderSize.Height;
-            child.Width = frameworkElement.RenderSize.Width;
-            child.Height = frameworkElement.RenderSize.Height;
-        }
-
-        private Thumb GetResizeThumb(Cursor cur, HorizontalAlignment hor, VerticalAlignment ver)
-        {
-            var thumb = new Thumb
-            {
-                Width = THUMB_SIZE,
-                Height = THUMB_SIZE,
-                HorizontalAlignment = hor,
-                VerticalAlignment = ver,
-                Cursor = cur,
-                Template = new ControlTemplate(typeof(Thumb))
-                {
-                    VisualTree = GetFactory(new SolidColorBrush(Colors.White))
-                }
-            };
-            var maxWidth = double.IsNaN(canvas.Width) ? canvas.ActualWidth : canvas.Width;
-            var maxHeight = double.IsNaN(canvas.Height) ? canvas.ActualHeight : canvas.Height;
-            thumb.DragDelta += (s, e) =>
-            {
-                var element = AdornedElement as FrameworkElement;
-                if (element == null)
-                    return;
-                Resize(element);
-                
-                switch (thumb.VerticalAlignment)
-                {
-                    case VerticalAlignment.Bottom:
-                        if (element.Height + e.VerticalChange > MINIMAL_SIZE)
-                        {
-                            var newHeight = element.Height + e.VerticalChange;
-                            var top = Canvas.GetTop(element) + newHeight;
-                            if (newHeight > 0 && top <= canvas.ActualHeight)
-                                element.Height = newHeight;
-                        }
-                        break;
-
-                    case VerticalAlignment.Top:
-                        if (element.Height - e.VerticalChange > MINIMAL_SIZE)
-                        {
-
-                            var newHeight = element.Height - e.VerticalChange;
-                            var top = Canvas.GetTop(element);
-                            if (newHeight > 0 && top + e.VerticalChange >= 0)
-                            {
-                                element.Height = newHeight;
-                                Canvas.SetTop(element, top + e.VerticalChange);
-                            }
-                        }
-
-                        break;
-                }
-
-                switch (thumb.HorizontalAlignment)
-                {
-                    case HorizontalAlignment.Left:
-                        if (element.Width - e.HorizontalChange > MINIMAL_SIZE)
-                        {
-                            var newWidth = element.Width - e.HorizontalChange;
-                            var left = Canvas.GetLeft(element);
-                            if (newWidth > 0 && left + e.HorizontalChange >= 0)
-                            {
-                                element.Width = newWidth;
-                                Canvas.SetLeft(element, left + e.HorizontalChange);
-                            }
-                        }
-
-                        break;
-                    case HorizontalAlignment.Right:
-                        if (element.Width + e.HorizontalChange > MINIMAL_SIZE)
-                        {
-                            var newWidth = element.Width + e.HorizontalChange;
-                            var left = Canvas.GetLeft(element) + newWidth;
-                            if (newWidth > 0 && left <= canvas.ActualWidth)
-                                element.Width = newWidth;
-                        }
-                            
-                        break;
-                }
-
-                e.Handled = true;
-            };
-            return thumb;
-        }
-
-        private FrameworkElementFactory GetFactory(Brush back)
-        {
-            var fef = new FrameworkElementFactory(typeof(Ellipse));
-            fef.SetValue(Shape.FillProperty, back);
-            fef.SetValue(Shape.StrokeProperty, ControlsHelper.PrimaryNormalBrush);
-            fef.SetValue(Shape.StrokeThicknessProperty, (double)2);
-            return fef;
-        }
-
-        protected override Visual GetVisualChild(int index)
-        {
-            return visCollec[index];
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAngle.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAngle.cs
deleted file mode 100644
index b5496758..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/ThumbAngle.cs
+++ /dev/null
@@ -1,99 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Shapes;
-
-namespace WPFDevelopers.Samples.ExampleViews
-{
-    public class ThumbAngle : Thumb
-    {
-        private Canvas canvas;
-        private Point centerPoint;
-        private Border designerItem;
-        private double initialAngle;
-        private RotateTransform rotateTransform;
-        private Vector startVector;
-
-        public ThumbAngle()
-        {
-            Cursor = Cursors.Hand;
-            Width = 16;
-            Height = 16;
-            VerticalAlignment = VerticalAlignment.Top;
-            Margin = new Thickness(0, -28, 0, 0);
-            Template = new ControlTemplate(typeof(Thumb))
-            {
-                VisualTree = GetFactory(GetMoveEllipseBack())
-            };
-            ToolTip = "旋转";
-            DragDelta += Thumb_DragDelta;
-            DragStarted += Thumb_DragStarted;
-        }
-
-        private Brush GetMoveEllipseBack()
-        {
-            var lan =
-                "M242 842l60-60c48 36 106 60 168 68v86c-86-8-164-42-228-94zM554 850c62-8 120-32 166-68l62 60c-64 52-142 86-228 94v-86zM782 722c36-48 60-104 68-166h86c-8 86-42 162-94 226zM640 512c0 70-58 128-128 128s-128-58-128-128 58-128 128-128 128 58 128 128zM174 554c8 62 32 120 68 166l-60 62c-52-64-86-142-94-228h86zM242 302c-36 48-60 106-68 168h-86c8-86 42-164 94-228zM850 470c-8-62-32-120-68-168l60-60c52 64 86 142 94 228h-86zM782 182l-60 60c-48-36-106-60-168-68v-86c86 8 164 42 228 94zM470 174c-62 8-120 32-168 68l-60-60c64-52 142-86 228-94v86z";
-            var converter = TypeDescriptor.GetConverter(typeof(Geometry));
-            var geometry = (Geometry)converter.ConvertFrom(lan);
-            TileBrush bsh =
-                new DrawingBrush(new GeometryDrawing(Brushes.White, new Pen(Brushes.Transparent, 2), geometry));
-            bsh.Stretch = Stretch.Fill;
-            return bsh;
-        }
-
-        private FrameworkElementFactory GetFactory(Brush back)
-        {
-            var elementFactory = new FrameworkElementFactory(typeof(Ellipse));
-            elementFactory.SetValue(Shape.FillProperty, back);
-            return elementFactory;
-        }
-
-        private void Thumb_DragDelta(object sender, DragDeltaEventArgs e)
-        {
-            if (designerItem != null && canvas != null)
-            {
-                var currentPoint = Mouse.GetPosition(canvas);
-                var deltaVector = Point.Subtract(currentPoint, centerPoint);
-
-                var angle = Vector.AngleBetween(startVector, deltaVector);
-
-                var rotateTransform = designerItem.RenderTransform as RotateTransform;
-                rotateTransform.Angle = initialAngle + Math.Round(angle, 0);
-                designerItem.InvalidateMeasure();
-            }
-        }
-
-        private void Thumb_DragStarted(object sender, DragStartedEventArgs e)
-        {
-            var thumb = sender as Thumb;
-            designerItem = thumb.DataContext as Border;
-            canvas = VisualTreeHelper.GetParent(designerItem) as Canvas;
-            if (canvas != null)
-            {
-                centerPoint = designerItem.TranslatePoint(
-                    new Point(designerItem.Width * designerItem.RenderTransformOrigin.X,
-                        designerItem.Height * designerItem.RenderTransformOrigin.Y),
-                    canvas);
-
-                var startPoint = Mouse.GetPosition(canvas);
-                startVector = Point.Subtract(startPoint, centerPoint);
-
-                rotateTransform = designerItem.RenderTransform as RotateTransform;
-                if (rotateTransform == null)
-                {
-                    designerItem.RenderTransform = new RotateTransform(0);
-                    initialAngle = 0;
-                }
-                else
-                {
-                    initialAngle = rotateTransform.Angle;
-                }
-            }
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/TransformThumb.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/TransformThumb.cs
deleted file mode 100644
index cd78616a..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/TransformThumb.cs
+++ /dev/null
@@ -1,242 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Documents;
-using System.Windows.Media;
-
-namespace WPFDevelopers.Samples.ExampleViews
-{
-    public class TransformThumb : ContentControl
-    {
-        public Guid Id { get; private set; }
-        public TransformThumb()
-        {
-            Id = Guid.NewGuid();
-        }
-        public Type ContentType
-        {
-            get { return (Type)GetValue(ContentTypeProperty); }
-            set { SetValue(ContentTypeProperty, value); }
-        }
-
-        public static readonly DependencyProperty ContentTypeProperty =
-            DependencyProperty.Register("ContentType", typeof(Type), typeof(TransformThumb));
-
-        // 选中事件
-
-        // 点击事件
-
-        public event EventHandler Click
-        {
-            add { AddHandler(ClickEvent, value); }
-            remove { RemoveHandler(ClickEvent, value); }
-        }
-
-        public static readonly RoutedEvent ClickEvent = EventManager.RegisterRoutedEvent(
-        "Click", RoutingStrategy.Bubble, typeof(EventHandler), typeof(TransformThumb));
-
-
-        public PrintState PrintState
-        {
-            get { return (PrintState)GetValue(PrintStateProperty); }
-            set { SetValue(PrintStateProperty, value); }
-        }
-
-        public static readonly DependencyProperty PrintStateProperty =
-            DependencyProperty.Register("PrintState", typeof(PrintState), typeof(TransformThumb), new PropertyMetadata(PrintState.Printing));
-
-        public bool IsSeleted
-        {
-            get { return (bool)GetValue(IsSeletedProperty); }
-            set { SetValue(IsSeletedProperty, value); }
-        }
-
-        public static readonly DependencyProperty IsSeletedProperty =
-            DependencyProperty.Register("IsSeleted", typeof(bool), typeof(TransformThumb), new FrameworkPropertyMetadata(false, (s, e) => {
-
-                // 显示遮罩
-                TransformThumb transform = s as TransformThumb;
-                if (transform != null)
-                {
-                    // 判定为选中还是非选中
-                    bool selected = (bool)e.NewValue;
-                    string status = selected ? "选中" : "非选中";
-                    // 控制选中效果
-                    Debug.WriteLine($"节点：{transform.Id} 节点状态：{status}");
-                    //transform.SetValue(ThumbTypeProperty, ThumbType.Style3);
-                    UIElement element = transform as UIElement;
-                    if (element == null)
-                    {
-                        return;
-                    }
-                    var adornerLayer = AdornerLayer.GetAdornerLayer(element);
-                    if (adornerLayer != null)
-                    {
-                        var adorners = adornerLayer.GetAdorners(element);
-                        Type oldtype = null;
-                        switch (transform.ThumbType)
-                        {
-                            case ThumbType.Style1:
-                                oldtype = typeof(ElementAdorner);
-                                break;
-                            case ThumbType.Style2:
-                                oldtype = typeof(ThumbAdorner);
-                                break;
-                            case ThumbType.Style3:
-                                oldtype = typeof(ThumbAdorner2);
-                                break;
-                            default:
-                                oldtype = typeof(ThumbAdorner2);
-                                break;
-                        }
-                        foreach (var adorner in adorners)
-                        {
-                            if (adorner.GetType() == oldtype)
-                            {
-                                adorner.Visibility = selected? Visibility.Visible:Visibility.Hidden;
-                            }
-                        }
-                    }
-                }
-            }));
-
-
-        public ShapeType ShapeType
-        {
-            get { return (ShapeType)GetValue(ShapeTypeProperty); }
-            set { SetValue(ShapeTypeProperty, value); }
-        }
-
-        public static readonly DependencyProperty ShapeTypeProperty =
-            DependencyProperty.Register("ShapeType", typeof(ShapeType), typeof(TransformThumb));
-
-        public ThumbType ThumbType
-        {
-            get { return (ThumbType)GetValue(ThumbTypeProperty); }
-            set { SetValue(ThumbTypeProperty, value); }
-        }
-
-        public static readonly DependencyProperty ThumbTypeProperty =
-            DependencyProperty.Register("ThumbType", typeof(ThumbType), typeof(TransformThumb),new FrameworkPropertyMetadata(ThumbType.Style1, onPropertyChanged));
-
-        private static void onPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            UpdateAdorner(d, e);
-        }
-
-        static TransformThumb()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(TransformThumb), new FrameworkPropertyMetadata(typeof(TransformThumb)));
-        }
-        public override void OnApplyTemplate()
-        {
-            base.OnApplyTemplate();
-            IsVisibleChanged += TransformThumb_IsVisibleChanged;
-            CreateAdorner();
-        }
-        void CreateAdorner()
-        {
-            var adornerLayer = AdornerLayer.GetAdornerLayer(this);
-            if (adornerLayer != null)
-            {
-                Adorner adorner;
-                switch (ThumbType)
-                {
-                    case ThumbType.Style1:
-                        adorner = new ElementAdorner(this);
-                        break;
-                    case ThumbType.Style2:
-                        adorner = new ThumbAdorner(this);
-                        break;
-                    case ThumbType.Style3:
-                        adorner = new ThumbAdorner2(this);
-                        break;
-                    default:
-                        adorner = new ThumbAdorner2(this);
-                        break;
-                }
-                if (adorner != null)
-                {
-                    adorner.Visibility = Visibility.Hidden;
-                    adornerLayer.Add(adorner);
-                }
-            }
-        }
-
-        static void UpdateAdorner(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            UIElement element = d as UIElement;
-            if (element == null)
-            {
-                return;
-            }
-            var adornerLayer = AdornerLayer.GetAdornerLayer(element as Visual);
-            if (adornerLayer != null)
-            {
-                ThumbType oldvalue = (ThumbType)e.OldValue;
-                var adorners = adornerLayer.GetAdorners(element as UIElement);
-                Type oldtype = null;
-                switch (oldvalue)
-                {
-                    case ThumbType.Style1:
-                        oldtype = typeof(ElementAdorner);
-                        break;
-                    case ThumbType.Style2:
-                        oldtype = typeof(ThumbAdorner);
-                        break;
-                    case ThumbType.Style3:
-                        oldtype = typeof(ThumbAdorner2);
-                        break;
-                    default:
-                        oldtype = typeof(ThumbAdorner2);
-                        break;
-                }
-                foreach (var adorner in adorners) {
-                    if (adorner.GetType() == oldtype)
-                    {
-                        adornerLayer.Remove(adorner);
-                    }
-                }
-
-                ThumbType newvalue = (ThumbType)e.NewValue;
-                Adorner Newadorner;
-                switch (newvalue)
-                {
-                    case ThumbType.Style1:
-                        Newadorner = new ElementAdorner(element);
-                        break;
-                    case ThumbType.Style2:
-                        Newadorner = new ThumbAdorner(element);
-                        break;
-                    case ThumbType.Style3:
-                        Newadorner = new ThumbAdorner2(element);
-                        break;
-                    default:
-                        Newadorner = new ThumbAdorner2(element);
-                        break;
-                }
-                if (Newadorner != null)
-                {
-                    adornerLayer.Add(Newadorner);
-                }
-            }
-        }
-        private void TransformThumb_IsVisibleChanged(object sender, DependencyPropertyChangedEventArgs e)
-        {
-            if (e.NewValue is bool isVisible)
-            {
-                if (isVisible)
-                {
-                    CreateAdorner();
-                }
-
-            }
-        }
-
-        public override string ToString()
-        {
-            return $"{Id}";
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/TransformThumb.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/TransformThumb.xaml
deleted file mode 100644
index 2339ff95..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Controls/TransformThumb.xaml
+++ /dev/null
@@ -1,25 +0,0 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Samples.ExampleViews">
-
-    <Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type controls:TransformThumb}">
-        <Setter Property="MinHeight" Value="20" />
-        <Setter Property="MinWidth" Value="30" />
-        <Setter Property="Height" Value="100" />
-        <Setter Property="Width" Value="50" />
-        <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:TransformThumb}">
-                    <ContentPresenter
-                        x:Name="PART_ContentPresenter"
-                        Width="{TemplateBinding Width}"
-                        Height="{TemplateBinding Height}"
-                        Content="{TemplateBinding Content}" />
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-    </Style>
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/PrintState.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/PrintState.cs
deleted file mode 100644
index 331fdcec..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/PrintState.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace WPFDevelopers.Samples.ExampleViews
-{
-    /// <summary>
-    /// 绘制状态
-    /// </summary>
-    public enum PrintState
-    {
-        // 绘制
-        Printing,
-        // 编辑
-        Edit,
-        // 静默
-        Normal
-    }
-}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/ShapeType.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/ShapeType.cs
deleted file mode 100644
index 30d01209..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/ShapeType.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace WPFDevelopers.Samples.ExampleViews
-{
-    /// <summary>
-    /// 几何类
-    /// </summary>
-    public enum ShapeType
-    {
-        // 点
-        Point,
-        // 线条
-        Line,
-        // 三角
-        Triangle,
-        // 矩形
-        Rectangle,
-        // 椭圆
-        Elliptical,
-        // 多边形
-        Polygon
-    }
-}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/ThumbType.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/ThumbType.cs
deleted file mode 100644
index 9b916976..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/Datas/ThumbType.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-namespace WPFDevelopers.Samples.ExampleViews
-{
-    /// <summary>
-    /// 遮罩类型
-    /// </summary>
-    public enum ThumbType
-    {
-        // 样式一        
-        
-        // 样式二
-
-        // 样式三
-        Style1, Style2, Style3
-    }
-}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/DrapViewExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/DrapViewExample.xaml
deleted file mode 100644
index c19976d2..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/DrapViewExample.xaml
+++ /dev/null
@@ -1,159 +0,0 @@
-<UserControl
-    x:Class="WPFDevelopers.Samples.ExampleViews.DrapViewExample"
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    d:DesignHeight="450"
-    d:DesignWidth="800"
-    mc:Ignorable="d">
-    <controls:CodeViewer>
-        <!--  内容  -->
-        <DockPanel>
-            <DockPanel.Resources>
-                <Color x:Key="WD.MainContentForegroundColor">#FFF0F0F0</Color>
-                <Color x:Key="WD.MainContentBackgroundColor">#FFF5F5F5</Color>
-                <DrawingBrush
-                    x:Key="WD.MainContentForegroundDrawingBrush"
-                    RenderOptions.CachingHint="Cache"
-                    Stretch="None"
-                    TileMode="Tile"
-                    Viewport="0,0,16,16"
-                    ViewportUnits="Absolute">
-                    <DrawingBrush.Drawing>
-                        <DrawingGroup>
-                            <GeometryDrawing Brush="{DynamicResource WD.MainContentForegroundBrush}">
-                                <GeometryDrawing.Geometry>
-                                    <GeometryGroup>
-                                        <RectangleGeometry Rect="0,0,8,8" />
-                                        <RectangleGeometry Rect="8,8,8,8" />
-                                    </GeometryGroup>
-                                </GeometryDrawing.Geometry>
-                            </GeometryDrawing>
-                        </DrawingGroup>
-                    </DrawingBrush.Drawing>
-                </DrawingBrush>
-
-                <SolidColorBrush x:Key="WD.MainContentForegroundBrush" Color="{DynamicResource WD.MainContentForegroundColor}" />
-                <SolidColorBrush x:Key="WD.MainContentBackgroundBrush" Color="{DynamicResource WD.MainContentBackgroundColor}" />
-            </DockPanel.Resources>
-            <Border Margin="0,10" DockPanel.Dock="Top">
-                <StackPanel
-                    HorizontalAlignment="Center"
-                    Orientation="Horizontal"
-                    PreviewMouseLeftButtonDown="StackPanel_PreviewMouseLeftButtonDown">
-                    <RadioButton
-                        Margin="4,0"
-                        Background="Red"
-                        GroupName="color"
-                        IsChecked="True"
-                        Style="{StaticResource WD.ColorRadioButton}" />
-                    <RadioButton
-                        Margin="4,0"
-                        Background="DodgerBlue"
-                        GroupName="color"
-                        Style="{StaticResource WD.ColorRadioButton}" />
-                    <RadioButton
-                        Margin="4,0"
-                        Background="LimeGreen"
-                        GroupName="color"
-                        Style="{StaticResource WD.ColorRadioButton}" />
-                    <RadioButton
-                        Margin="4,0"
-                        Background="Yellow"
-                        GroupName="color"
-                        Style="{StaticResource WD.ColorRadioButton}" />
-                </StackPanel>
-            </Border>
-            <Border Margin="0,10" DockPanel.Dock="Top">
-                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                    <RadioButton
-                        VerticalContentAlignment="Center"
-                        Content="点"
-                        GroupName="polygon"
-                        Tag="0" />
-                    <RadioButton
-                        VerticalContentAlignment="Center"
-                        Content="线"
-                        GroupName="polygon"
-                        Tag="1" />
-                    <RadioButton
-                        VerticalContentAlignment="Center"
-                        Content="三角形"
-                        GroupName="polygon"
-                        Tag="2" />
-                    <RadioButton
-                        VerticalContentAlignment="Center"
-                        Content="矩形"
-                        GroupName="polygon"
-                        IsChecked="True"
-                        Tag="3" />
-                    <RadioButton
-                        VerticalContentAlignment="Center"
-                        Content="多边形"
-                        GroupName="polygon"
-                        Tag="4" />
-                </StackPanel>
-            </Border>
-            <Border Margin="0,10" DockPanel.Dock="Top">
-                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                    <RadioButton
-                        VerticalContentAlignment="Center"
-                        Checked="RadioButton_Checked"
-                        Content="Style1"
-                        GroupName="style"
-                        IsChecked="True"
-                        Tag="YYYY" />
-                    <RadioButton
-                        VerticalContentAlignment="Center"
-                        Checked="RadioButton_Checked"
-                        Content="Style2"
-                        GroupName="style"
-                        Tag="1" />
-                    <RadioButton
-                        VerticalContentAlignment="Center"
-                        Checked="RadioButton_Checked"
-                        Content="Style3"
-                        GroupName="style"
-                        Tag="2" />
-                    <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                        <Button
-                            Name="btn_import"
-                            Margin="10,0"
-                            Padding="10,5"
-                            Content="导入" />
-                        <Button
-                            Name="btn_export"
-                            Margin="10,0"
-                            Padding="10,5"
-                            Content="导出" />
-                        <Button
-                            Name="btn_remove"
-                            Margin="10,0"
-                            Padding="10,5"
-                            Click="btn_remove_Click"
-                            Content="删除选中" />
-                        <Button
-                            Name="btn_removeAll"
-                            Margin="10,0"
-                            Padding="10,5"
-                            Click="btn_removeAll_Click"
-                            Content="清空画板" />
-                    </StackPanel>
-                </StackPanel>
-            </Border>
-            <Border Width="200" DockPanel.Dock="Left">
-                <ListBox x:Name="lst_layers" />
-            </Border>
-            <Canvas
-                Name="MainCanvas"
-                Background="{StaticResource WD.MainContentForegroundDrawingBrush}"
-                ClipToBounds="True"
-                MouseLeftButtonDown="MainCanvas_MouseLeftButtonDown"
-                MouseLeftButtonUp="MainCanvas_MouseLeftButtonUp"
-                MouseMove="MainCanvas_MouseMove" />
-        </DockPanel>
-    </controls:CodeViewer>
-</UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/DrapViewExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/DrapViewExample.xaml.cs
deleted file mode 100644
index d64a268d..00000000
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrapView/DrapViewExample.xaml.cs
+++ /dev/null
@@ -1,229 +0,0 @@
-using System.Windows.Controls;
-using System.Windows;
-using System.Windows.Shapes;
-using System.Diagnostics;
-using System.Windows.Input;
-using System.Windows.Media;
-using System;
-
-namespace WPFDevelopers.Samples.ExampleViews
-{
-    /// <summary>
-    /// DrapViewExample.xaml 的交互逻辑
-    /// </summary>
-    public partial class DrapViewExample : UserControl
-    {
-        Point start;
-        TransformThumb element;
-        Rectangle shape;
-        ThumbType selectThumb;
-        Brush currentBrush = new SolidColorBrush(Colors.Red);
-        public DrapViewExample()
-        {
-            InitializeComponent();
-        }
-        private void MainCanvas_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            //鼠标左键按下
-            Debug.WriteLine("鼠标左键按下");
-            // 更新选中项
-            UpdateDraw();
-            // 判定是否包含快捷键
-
-            // 判定左键按下
-            if (element != null && element.PrintState == PrintState.Edit)
-            {
-                // 设置选项选中
-                element.IsSeleted = true;
-                element = null;
-                e.Handled = true;
-                return;
-            }
-
-            start = e.GetPosition(MainCanvas);
-            // 创建几何实例
-            shape = new Rectangle();
-            shape.Stroke = currentBrush;
-            shape.Fill = currentBrush;
-            shape.StrokeThickness = 1;
-            shape.Width = 0;
-            shape.Height = 0;
-            shape.MouseLeftButtonDown += (s, e1) => {
-                e.Handled = false;
-            };
-            element = new TransformThumb();
-            element.MouseLeftButtonDown += (s, e2) => {
-                TransformThumb transform = s as TransformThumb;
-                if (transform != null)
-                {
-                    Debug.WriteLine($"节点：{transform.Id} 节点按下");
-                    transform.PrintState = PrintState.Edit;
-                    element = transform;
-                    e.Handled = false;
-                }
-            };
-            element.MouseLeftButtonUp += (s, e3) => {
-                e.Handled = false;
-            };
-            
-            element.Content = shape;
-            element.Width = shape.Width;
-            element.Height = shape.Height;
-            element.ThumbType = selectThumb;
-            element.ContentType = shape.GetType();
-            element.PrintState = PrintState.Printing;
-            
-        }
-
-        private void MainCanvas_MouseLeftButtonUp(object sender, MouseButtonEventArgs e)
-        {
-            // 鼠标左键键起
-            Debug.WriteLine("鼠标左键键起");
-
-            // 更新选中项
-            UpdateDraw();
-            // 键下和键起在同一个位置表示页面无选择项
-            Point end = Mouse.GetPosition(MainCanvas);
-            if (end == start)
-            {
-                // 移除节点
-                MainCanvas.Children.Remove(element);
-                // 重置绘制节点
-                element = null;
-                return;
-            }
-            if (element != null && element.PrintState != PrintState.Edit)
-            {
-                element.IsSeleted = true;
-                element.PrintState = PrintState.Edit;
-            }
-            // 重置绘制节点
-            element = null;
-        }
-
-        private void UpdateDraw()
-        {
-            // 设置其他项默认隐藏
-            foreach (var item in MainCanvas.Children)
-            {
-                var child = item as TransformThumb;
-                if (child != null && child.IsSeleted && element != null)
-                {
-                    // 重置非选中项
-                    if (child != element)
-                    {
-                        child.IsSeleted = false;
-                        child.PrintState = PrintState.Normal;
-                    }
-                }
-            }
-        }
-
-        private void MainCanvas_MouseMove(object sender, MouseEventArgs e)
-        {
-            if (element == null)
-            {
-                return;
-            }
-            if (!NodeExist(element))
-            {
-                // 设置几何位置
-                Canvas.SetLeft(element, start.X);
-                Canvas.SetTop(element, start.Y);
-                // 更新其他选中项
-                UpdateDraw();
-                // 添加到面板中
-                MainCanvas.Children.Add(element);
-                lst_layers.Items.Add(element.ToString());
-            }
-            // 鼠标移动(鼠标未按下移动事件不生效)
-            if (e.LeftButton == MouseButtonState.Pressed && element.PrintState == PrintState.Printing)
-            {
-                Debug.WriteLine("鼠标移动绘制几何");
-                Point current = e.GetPosition(MainCanvas);
-                // 判定几何实例
-                // 判定鼠标移动点是否小于起始点
-                if (current.X - start.X < 0)
-                {
-                    // 设置起始点为移动点
-                    Canvas.SetLeft(element, current.X);
-                }
-                if (current.Y - start.Y < 0)
-                {
-                    // 设置起始点为移动点
-                    Canvas.SetTop(element, current.Y);
-                }
-                shape.SetValue(WidthProperty, Math.Abs(current.X - start.X));
-                shape.SetValue(HeightProperty, Math.Abs(current.Y - start.Y));
-                element.Width = Math.Abs(current.X - start.X);
-                element.Height = Math.Abs(current.Y - start.Y);
-            }
-        }
-
-        private void RadioButton_Checked(object sender, RoutedEventArgs e)
-        {
-            RadioButton radioButton = (RadioButton)sender;
-            if (radioButton != null)
-            {
-                ThumbType result;
-                if (Enum.TryParse(radioButton.Content.ToString(), out result))
-                {
-                    selectThumb = result;
-                }
-            }
-        }
-
-        private void btn_remove_Click(object sender, RoutedEventArgs e)
-        {
-            for (int i = 0; i < MainCanvas.Children.Count; i++)
-            {
-                UIElement item = MainCanvas.Children[i];
-                if (item is TransformThumb)
-                {
-                    var tranform = item as TransformThumb;
-                    if (tranform != null && tranform.IsSeleted)
-                    {
-                        MainCanvas.Children.Remove(tranform);
-                        lst_layers.Items.Remove(tranform.ToString());
-                    }
-                }
-            }
-        }
-
-        private bool NodeExist(TransformThumb node)
-        {
-            bool result = false;
-            int count = MainCanvas.Children.Count;
-            for (int i = 0; i < count; i++)
-            {
-                UIElement item = MainCanvas.Children[i];
-                if (item is TransformThumb)
-                {
-                    var tranform = item as TransformThumb;
-                    if (tranform == node)
-                    {
-                        result = true;
-                        break;
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        private void btn_removeAll_Click(object sender, RoutedEventArgs e)
-        {
-            MainCanvas.Children.Clear();
-            lst_layers.Items.Clear();
-        }
-
-        private void StackPanel_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
-        {
-            if (e.Source is RadioButton)
-            {
-                var radioButton = (RadioButton)e.Source;
-                currentBrush = radioButton.Background;
-            }
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml
index 1f6c98ae..d915026e 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/DrawerMenu/DrawerMenuExample.xaml
@@ -6,7 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews.DrawerMenu"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
@@ -20,43 +20,43 @@
                 Name="myFrame"
                 Grid.Column="1"
                 NavigationUIVisibility="Hidden" />
-            <wd:DrawerMenu SelectionChanged="DrawerMenu_SelectionChanged">
-                <wd:DrawerMenuItem Text="主页">
-                    <wd:DrawerMenuItem.Icon>
+            <wpfdev:DrawerMenu SelectionChanged="DrawerMenu_SelectionChanged">
+                <wpfdev:DrawerMenuItem Text="主页">
+                    <wpfdev:DrawerMenuItem.Icon>
                         <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/2.png" />
-                    </wd:DrawerMenuItem.Icon>
-                </wd:DrawerMenuItem>
-                <wd:DrawerMenuItem Text="Edge">
-                    <wd:DrawerMenuItem.Icon>
+                    </wpfdev:DrawerMenuItem.Icon>
+                </wpfdev:DrawerMenuItem>
+                <wpfdev:DrawerMenuItem Text="Edge">
+                    <wpfdev:DrawerMenuItem.Icon>
                         <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/4.png" />
-                    </wd:DrawerMenuItem.Icon>
-                </wd:DrawerMenuItem>
-                <wd:DrawerMenuItem Text="云盘">
-                    <wd:DrawerMenuItem.Icon>
+                    </wpfdev:DrawerMenuItem.Icon>
+                </wpfdev:DrawerMenuItem>
+                <wpfdev:DrawerMenuItem Text="云盘">
+                    <wpfdev:DrawerMenuItem.Icon>
                         <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/1.png" />
-                    </wd:DrawerMenuItem.Icon>
-                </wd:DrawerMenuItem>
-                <wd:DrawerMenuItem Text="邮件">
-                    <wd:DrawerMenuItem.Icon>
+                    </wpfdev:DrawerMenuItem.Icon>
+                </wpfdev:DrawerMenuItem>
+                <wpfdev:DrawerMenuItem Text="邮件">
+                    <wpfdev:DrawerMenuItem.Icon>
                         <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/8.png" />
-                    </wd:DrawerMenuItem.Icon>
-                </wd:DrawerMenuItem>
-                <wd:DrawerMenuItem Text="视频">
-                    <wd:DrawerMenuItem.Icon>
+                    </wpfdev:DrawerMenuItem.Icon>
+                </wpfdev:DrawerMenuItem>
+                <wpfdev:DrawerMenuItem Text="视频">
+                    <wpfdev:DrawerMenuItem.Icon>
                         <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/CircularMenu/6.png" />
-                    </wd:DrawerMenuItem.Icon>
-                </wd:DrawerMenuItem>
-                <wd:DrawerMenuItem Text="Bus">
-                    <wd:DrawerMenuItem.Icon>
+                    </wpfdev:DrawerMenuItem.Icon>
+                </wpfdev:DrawerMenuItem>
+                <wpfdev:DrawerMenuItem Text="Bus">
+                    <wpfdev:DrawerMenuItem.Icon>
                         <Path
                             Width="20"
                             Height="20"
                             Data="{StaticResource WD.BusGeometry}"
                             Fill="{DynamicResource WD.PlaceholderTextSolidColorBrush}"
                             Stretch="Uniform" />
-                    </wd:DrawerMenuItem.Icon>
-                </wd:DrawerMenuItem>
-            </wd:DrawerMenu>
+                    </wpfdev:DrawerMenuItem.Icon>
+                </wpfdev:DrawerMenuItem>
+            </wpfdev:DrawerMenu>
 
         </Grid>
         <controls:CodeViewer.SourceCodes>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/EdgeLightExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/EdgeLightExample.xaml
index 4652f2a8..a3464394 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/EdgeLightExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/EdgeLightExample.xaml
@@ -4,19 +4,19 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
         <UniformGrid Columns="2">
-            <wd:EdgeLight IsAnimation="{Binding ElementName=myCheckBox,Path=IsChecked}" Margin="10" LineSize="2">
+            <wpfdev:EdgeLight IsAnimation="{Binding ElementName=myCheckBox,Path=IsChecked}" Margin="10" LineSize="2">
                 <CheckBox Content="EdgeLight" x:Name="myCheckBox"/>
-            </wd:EdgeLight>
-            <wd:EdgeLight IsAnimation="{Binding ElementName=myToggleButton,Path=IsChecked}" Margin="10" 
+            </wpfdev:EdgeLight>
+            <wpfdev:EdgeLight IsAnimation="{Binding ElementName=myToggleButton,Path=IsChecked}" Margin="10" 
                               BorderBrush="OrangeRed" LineSize="4">
                 <ToggleButton Content="EdgeLight2" x:Name="myToggleButton"/>
-            </wd:EdgeLight>
+            </wpfdev:EdgeLight>
         </UniformGrid>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml
index 325a96a8..48853072 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/BallLoadingExample.xaml
@@ -3,12 +3,12 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wd:BallLoading Width="200"/>
+        <wpfdev:BallLoading Width="200"/>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel 
                 CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/BallLoadingExample.xaml" 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml
index 2f7664b8..130d7e9c 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/CycleLoadingExample.xaml
@@ -3,14 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wd:CycleLoading  Value="50" LoadTitle="Loading...." Width="200">
+        <wpfdev:CycleLoading  Value="50" LoadTitle="Loading...." Width="200">
             <TextBlock Text="activity"/>
-        </wd:CycleLoading>
+        </wpfdev:CycleLoading>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel 
                 CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/CycleLoadingExample.xaml" 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml
index 14f07466..fa4612ec 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RingLoadingExample.xaml
@@ -3,13 +3,13 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wd:RingLoading IsStart="true" 
+        <wpfdev:RingLoading IsStart="true" 
                             Width="400" Height="400"
                             Description="WPFDevelopers" Foreground="Black" ProgressValue="50"/>
         <controls:CodeViewer.SourceCodes>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml
index ac2df61c..fbdc7386 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/RollLoadingExample.xaml
@@ -3,17 +3,17 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wd:RollLoading IsStart="true" 
+        <wpfdev:RollLoading IsStart="true" 
                             HorizontalContentAlignment="Center" 
                             VerticalContentAlignment="Center"
                             Width="200">
             <TextBlock Text="Loading activity..."/>
-        </wd:RollLoading>
+        </wpfdev:RollLoading>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel 
                 CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/RollLoadingExample.xaml" 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml
index e62bfa6f..898e65b7 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/StreamerLoadingExample.xaml
@@ -3,16 +3,16 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wd:StreamerLoading>
-            <wd:StreamerLoading.Background>
+        <wpfdev:StreamerLoading>
+            <wpfdev:StreamerLoading.Background>
                 <SolidColorBrush Color="{DynamicResource WD.PrimaryNormalColor}"/>
-            </wd:StreamerLoading.Background>
-        </wd:StreamerLoading>
+            </wpfdev:StreamerLoading.Background>
+        </wpfdev:StreamerLoading>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel 
                 CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/StreamerLoadingExample.xaml" 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml
index 38daba47..6661a0d2 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/Loading/WaitLoadingExample.xaml
@@ -3,12 +3,12 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wd:WaitLoading/>
+        <wpfdev:WaitLoading/>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel 
                 CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/Loading/WaitLoadingExample.xaml" 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml
index b5aaca2c..2d7e68d5 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml
@@ -49,17 +49,8 @@
                         HorizontalAlignment="Center"
                         VerticalAlignment="Top"
                         wd:Loading.IsShow="{Binding ElementName=MyCheckBox, Path=IsChecked}"
-                        wd:Loading.LoadingType="Normal"
                         Content="提交"
                         Style="{StaticResource WD.PrimaryButton}" />
-                    <Button
-                        Margin="0,10"
-                        HorizontalAlignment="Center"
-                        VerticalAlignment="Top"
-                        Click="Btn_LoadingExtClick"
-                        Content="LoadingExt 当UI线程阻塞时使用"
-                        Style="{StaticResource WD.SuccessPrimaryButton}"
-                        ToolTip="当UI线程阻塞时使用" />
                 </UniformGrid>
             </StackPanel>
         </Grid>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml.cs
index c2b3a416..5461ae43 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/LoadingExample.xaml.cs
@@ -1,9 +1,4 @@
-using System.Runtime.CompilerServices;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using WPFDevelopers.Controls;
+using System.Windows.Controls;
 
 namespace WPFDevelopers.Samples.ExampleViews
 {
@@ -16,28 +11,5 @@ public LoadingExample()
         {
             InitializeComponent();
         }
-
-        private void Btn_LoadingExtClick(object sender, System.Windows.RoutedEventArgs e)
-        {
-            var loading = new LoadingExt();
-            loading.Show();
-            var task = new Task(() =>
-            {
-                for (int i = 0; i < 5; i++)
-                {
-                    //模拟卡UI线程
-                    Application.Current.Dispatcher.Invoke(new System.Action(() =>
-                    {
-                        Thread.Sleep(1000);
-                    }));
-                }
-
-            });
-            task.ContinueWith(previousTask =>
-            {
-                loading.Close();
-            }, TaskScheduler.FromCurrentSynchronizationContext());
-            task.Start();
-        }
     }
 }
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MagnifierExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MagnifierExample.xaml
index d671426d..f9222e9a 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MagnifierExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MagnifierExample.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
@@ -18,7 +18,7 @@
                 Margin="0,10"/>
             </UniformGrid>
             <Image Source="pack://application:,,,/WPFDevelopers.Samples;component/Resources/Images/Craouse/0.jpg" Stretch="None"
-                   wd:Magnifier.Add="{x:Static wd:Magnifier.Default}"/>
+                   wpfdev:Magnifier.Add="{x:Static wpfdev:Magnifier.Default}"/>
         </StackPanel>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
index da86b6c0..d04e7ee8 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/MainWindow.xaml
@@ -3,7 +3,6 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:System="clr-namespace:System;assembly=mscorlib"
-    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:example="clr-namespace:WPFDevelopers.Samples.ExampleViews"
     xmlns:helpers="clr-namespace:WPFDevelopers.Samples.Helpers"
@@ -64,34 +63,18 @@
                 <ColumnDefinition Width="Auto" />
                 <ColumnDefinition />
             </Grid.ColumnDefinitions>
-            <Grid Margin="0,0,3,0">
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="Auto" />
-                    <RowDefinition />
-                </Grid.RowDefinitions>
-                <TextBox
-                    Name="PART_MenuTextBox"
-                    wd:ElementHelper.IsClear="True"
-                    wd:ElementHelper.Watermark="Please input">
-                    <i:Interaction.Triggers>
-                        <i:EventTrigger EventName="TextChanged">
-                            <i:InvokeCommandAction Command="{Binding MenuSearchTextChanged}" CommandParameter="{Binding ElementName=PART_MenuTextBox, Path=Text}" />
-                        </i:EventTrigger>
-                    </i:Interaction.Triggers>
-                </TextBox>
-                <controls:NavigateMenu
-                    x:Name="NavigateMenu"
-                    Grid.Row="1"
-                    Margin="0,3,0,0"
-                    DisplayMemberPath="Name"
-                    ItemsSource="{Binding NavigateMenuModelList}">
+            <Border
+                Margin="0,0,5,0"
+                Background="{DynamicResource WD.BackgroundSolidColorBrush}"
+                Effect="{StaticResource WD.NormalShadowDepth}">
+                <wd:NavigateMenu x:Name="NavigateMenu" ItemsSource="{Binding NavigateMenuModelList}">
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="SelectionChanged">
                             <i:InvokeCommandAction Command="{Binding MenuSelectionChangedCommand}" CommandParameter="{Binding ElementName=NavigateMenu, Path=SelectedItem}" />
                         </i:EventTrigger>
                     </i:Interaction.Triggers>
-                </controls:NavigateMenu>
-            </Grid>
+                </wd:NavigateMenu>
+            </Border>
             <GridSplitter
                 Grid.Column="1"
                 Width="5"
@@ -101,7 +84,8 @@
             <Border
                 Grid.Column="2"
                 Margin="5,0,0,0"
-                Background="{DynamicResource WD.BackgroundSolidColorBrush}">
+                Background="{DynamicResource WD.BackgroundSolidColorBrush}"
+                Effect="{StaticResource WD.NormalShadowDepth}">
                 <ContentControl Content="{Binding ControlPanel}" />
             </Border>
         </Grid>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/PaginationExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/PaginationExample.xaml
index ee2f2731..830c077e 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/PaginationExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/PaginationExample.xaml
@@ -6,7 +6,7 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
@@ -42,25 +42,27 @@
             <ListBox
                 Grid.Row="1"
                 Grid.Column="0"
-                Margin="0,0,0,10"
+                Margin="20,0,0,0"
                 ItemsSource="{Binding NormalPaginationViewModel.PaginationCollection}" />
             <ListBox
                 Grid.Row="1"
                 Grid.Column="2"
-                Margin="0,0,0,10"
+                Margin="0,0,20,0"
                 ItemsSource="{Binding LitePaginationViewModel.PaginationCollection}" />
 
-            <wd:Pagination
+            <wpfdev:Pagination
                 Grid.Row="2"
                 Grid.Column="0"
+                Margin="20,0,0,0"
                 Count="{Binding NormalPaginationViewModel.Count, Mode=TwoWay}"
                 CountPerPage="{Binding NormalPaginationViewModel.CountPerPage, Mode=TwoWay}"
                 Current="{Binding NormalPaginationViewModel.Current, Mode=TwoWay}"
                 IsLite="False" />
 
-            <wd:Pagination
+            <wpfdev:Pagination
                 Grid.Row="2"
                 Grid.Column="2"
+                Margin="0,0,20,0"
                 Count="{Binding LitePaginationViewModel.Count, Mode=TwoWay}"
                 CountPerPage="{Binding LitePaginationViewModel.CountPerPage, Mode=TwoWay}"
                 Current="{Binding LitePaginationViewModel.Current, Mode=TwoWay}"
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml
similarity index 75%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml
index 705ce488..3b7c834c 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml
@@ -1,12 +1,12 @@
 <UserControl
-    x:Class="WPFDevelopers.Samples.ExampleViews.ChartRadarExample"
+    x:Class="WPFDevelopers.Samples.ExampleViews.RadarChartExample"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
@@ -40,12 +40,12 @@
                         FontSize="18"
                         FontWeight="Black"
                         Foreground="#2B579A"
-                        Text="{Binding NowPlayerName, RelativeSource={RelativeSource AncestorType=local:ChartRadarExample}}" />
+                        Text="{Binding NowPlayerName, RelativeSource={RelativeSource AncestorType=local:RadarChartExample}}" />
                 </WrapPanel>
-                <wd:ChartRadar
+                <wpfdev:RadarChart
                     Grid.Row="1"
                     Grid.Column="0"
-                    Datas="{Binding Datas, RelativeSource={RelativeSource AncestorType=local:ChartRadarExample}}" />
+                    RadarArray="{Binding RadarModels, RelativeSource={RelativeSource AncestorType=local:RadarChartExample}}" />
                 <Button
                     Grid.Row="2"
                     Width="200"
@@ -56,8 +56,12 @@
             </Grid>
         </Border>
         <controls:CodeViewer.SourceCodes>
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ChartRadarExample.xaml" CodeType="Xaml" />
-            <controls:SourceCodeModel CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/ChartRadarExample.xaml.cs" CodeType="CSharp" />
+            <controls:SourceCodeModel 
+                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/RadarChartExample.xaml" 
+                CodeType="Xaml"/>
+            <controls:SourceCodeModel 
+                CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/RadarChartExample.xaml.cs" 
+                CodeType="CSharp"/>
         </controls:CodeViewer.SourceCodes>
     </controls:CodeViewer>
 </UserControl>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml.cs b/src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml.cs
similarity index 69%
rename from src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml.cs
rename to src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml.cs
index d946a885..b7837dc4 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ChartRadarExample.xaml.cs
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/RadarChartExample.xaml.cs
@@ -10,19 +10,17 @@
 namespace WPFDevelopers.Samples.ExampleViews
 {
     /// <summary>
-    /// ChartRadarExample.xaml 的交互逻辑
+    /// RadarChartExample.xaml 的交互逻辑
     /// </summary>
-    public partial class ChartRadarExample : UserControl
+    public partial class RadarChartExample : UserControl
     {
-        public IEnumerable<KeyValuePair<string, double>> Datas
+        public ObservableCollection<RadarModel> RadarModels
         {
-            get { return (IEnumerable<KeyValuePair<string, double>>)GetValue(DatasProperty); }
-            set { SetValue(DatasProperty, value); }
+            get { return (ObservableCollection<RadarModel>)GetValue(RadarModelsProperty); }
+            set { SetValue(RadarModelsProperty, value); }
         }
-
-        public static readonly DependencyProperty DatasProperty =
-            DependencyProperty.Register("Datas", typeof(IEnumerable<KeyValuePair<string, double>>), typeof(ChartRadarExample), new PropertyMetadata(null));
-
+        public static readonly DependencyProperty RadarModelsProperty =
+       DependencyProperty.Register("RadarModels", typeof(ObservableCollection<RadarModel>), typeof(RadarChartExample), new PropertyMetadata(null));
         List<Player> Players = new List<Player>();
         private int NowPlayerIndex = 0;
         public string NowPlayerName
@@ -31,22 +29,23 @@ public string NowPlayerName
             set { SetValue(NowPlayerNameProperty, value); }
         }
         public static readonly DependencyProperty NowPlayerNameProperty =
-     DependencyProperty.Register("NowPlayerName", typeof(string), typeof(ChartRadarExample), new PropertyMetadata(null));
+     DependencyProperty.Register("NowPlayerName", typeof(string), typeof(RadarChartExample), new PropertyMetadata(null));
 
-        List<List<KeyValuePair<string, double>>> collectionList = new List<List<KeyValuePair<string, double>>>();
-        public ChartRadarExample()
+        List<ObservableCollection<RadarModel>> collectionList = new List<ObservableCollection<RadarModel>>();
+        public RadarChartExample()
         {
             InitializeComponent();
+            RadarModels = new ObservableCollection<RadarModel>();
             Player theShy = new Player()
             {
                 姓名 = "The Shy",
-                击杀 = 800,
-                助攻 = 500,
+                击杀 = 80,
+                助攻 = 50,
                 物理 = 90,
-                生存 = 120,
-                金钱 = 360,
-                防御 = 230,
-                魔法 = 130
+                生存 = 10,
+                金钱 = 60,
+                防御 = 30,
+                魔法 = 30
             };
             Player xiaoHu = new Player()
             {
@@ -78,7 +77,7 @@ public ChartRadarExample()
                 物理 = 80,
                 生存 = 70,
                 金钱 = 80,
-                防御 = 100,
+                防御 = 80,
                 魔法 = 30
             };
             Players.AddRange(new[] { theShy, xiaoHu, yinHang, flandre });
@@ -89,14 +88,14 @@ public ChartRadarExample()
 
             foreach (var player in Players)
             {
-                var collectionpPayer = new List<KeyValuePair<string, double>>();
+                var collectionpPayer = new ObservableCollection<RadarModel>();
                 Array.ForEach<PropertyInfo>(pArray, p =>
                 {
-                    collectionpPayer.Add(new KeyValuePair<string, double>( $"{p.Name}（{(int)p.GetValue(player, null)}分）", (int)p.GetValue(player, null)));
+                    collectionpPayer.Add(new RadarModel { Text = $"{p.Name}（{(int)p.GetValue(player, null)}分）", ValueMax = (int)p.GetValue(player, null) });
                 });
                 collectionList.Add(collectionpPayer);
             }
-            Datas = collectionList[0];
+            RadarModels = collectionList[0];
             NowPlayerName = Players[0].姓名;
         }
 
@@ -107,7 +106,7 @@ private void Button_Click(object sender, RoutedEventArgs e)
             {
                 NowPlayerIndex = 0;
             }
-            Datas = collectionList[NowPlayerIndex];
+            RadarModels = collectionList[NowPlayerIndex];
             NowPlayerName = Players[NowPlayerIndex].姓名;
         }
     }
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml
index b9552223..24b0fcd0 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/RulerControlExample.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
@@ -18,19 +18,19 @@
                 <Grid Background="{StaticResource WD.CircularDualSolidColorBrush}" Height="51" Margin="40,0">
                     <Path Stroke="{StaticResource WD.SuccessPressedSolidColorBrush}" StrokeThickness="1" Fill="{StaticResource WD.SuccessPressedSolidColorBrush}"
                   Data="{Binding ElementName=PART_Ruler, Path=CurrentGeometry,Mode=TwoWay}" />
-                    <wd:Ruler x:Name="PART_Ruler" Margin="40,0" Interval="20" StartValue="10" EndValue="210"
+                    <wpfdev:Ruler x:Name="PART_Ruler" Margin="40,0" Interval="20" StartValue="10" EndValue="210"
                           CurrentValue="{Binding ElementName=PART_Slider,Path=Value,Mode=TwoWay}"/>
                 </Grid>
                 <Grid Background="{StaticResource WD.DangerPressedSolidColorBrush}" Height="51" Margin="40,0">
                     <Path Stroke="{StaticResource WD.SuccessPressedSolidColorBrush}" StrokeThickness="1" Fill="{StaticResource WD.SuccessPressedSolidColorBrush}"
                   Data="{Binding ElementName=PART_Ruler1, Path=CurrentGeometry,Mode=TwoWay}" />
-                    <wd:Ruler x:Name="PART_Ruler1" Margin="40,0" Interval="20" StartValue="10" EndValue="210"
+                    <wpfdev:Ruler x:Name="PART_Ruler1" Margin="40,0" Interval="20" StartValue="10" EndValue="210"
                           CurrentValue="{Binding ElementName=PART_Slider,Path=Value,Mode=TwoWay}"/>
                 </Grid>
                 <Grid Background="{StaticResource WD.WarningPressedSolidColorBrush}" Height="51" Margin="40,0">
                     <Path Stroke="{StaticResource WD.SuccessPressedSolidColorBrush}" StrokeThickness="1" Fill="{StaticResource WD.SuccessPressedSolidColorBrush}"
                   Data="{Binding ElementName=PART_Ruler2, Path=CurrentGeometry,Mode=TwoWay}" />
-                    <wd:Ruler x:Name="PART_Ruler2" Margin="40,0" Interval="20" StartValue="10" EndValue="210"
+                    <wpfdev:Ruler x:Name="PART_Ruler2" Margin="40,0" Interval="20" StartValue="10" EndValue="210"
                           CurrentValue="{Binding ElementName=PART_Slider,Path=Value,Mode=TwoWay}"/>
                 </Grid>
             </UniformGrid>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/SixGirdViewExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/SixGirdViewExample.xaml
index cc8498ac..32e60cc4 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/SixGirdViewExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/SixGirdViewExample.xaml
@@ -3,14 +3,14 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
               xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
-        <wd:SixGirdView BorderThickness="1" SelectBrush="Red">
-            <wd:SixGirdView.Resources>
+        <wpfdev:SixGirdView BorderThickness="1" SelectBrush="Red">
+            <wpfdev:SixGirdView.Resources>
                 <Style TargetType="TextBlock">
                     <Setter Property="Foreground" Value="White"/>
                     <Setter Property="VerticalAlignment" Value="Center"/>
@@ -19,11 +19,11 @@
                 <Style TargetType="Border">
                     <Setter Property="Margin" Value="1"/>
                 </Style>
-            </wd:SixGirdView.Resources>
+            </wpfdev:SixGirdView.Resources>
             <MediaElement x:Name="MyMediaElement" Loaded="MyMediaElement_Loaded"
                           MediaEnded="MyMediaElement_MediaEnded"/>
             <Border Background="#282C34">
-                <wd:SmallPanel>
+                <wpfdev:SmallPanel>
                     <TextBlock Text="信号源1"/>
                     <Border Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
                             VerticalAlignment="Top"
@@ -32,7 +32,7 @@
                             CornerRadius="3">
                         <TextBlock Text="HD"/>
                     </Border>
-                </wd:SmallPanel>
+                </wpfdev:SmallPanel>
             </Border>
             <Border Background="#282C34">
                 <TextBlock Text="无信号"/>
@@ -46,7 +46,7 @@
             <Border Background="#282C34">
                 <TextBlock Text="无信号"/>
             </Border>
-        </wd:SixGirdView>
+        </wpfdev:SixGirdView>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel 
                 CodeSource="/WPFDevelopers.SamplesCode;component/ExampleViews/SixGirdViewExample.xaml" 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/SpotLightExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/SpotLightExample.xaml
index ec94c294..0aff2e65 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/SpotLightExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/SpotLightExample.xaml
@@ -4,17 +4,17 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
     <controls:CodeViewer>
         <UniformGrid Rows="2" Background="#222222">
-            <wd:SpotLight FontSize="50" Text="YanJinHua" 
+            <wpfdev:SpotLight FontSize="50" Text="YanJinHua" 
                           DefaultForeground="Crimson" 
                           Foreground="Fuchsia" 
                           Duration="00:00:05" />
-            <wd:SpotLight/>
+            <wpfdev:SpotLight/>
         </UniformGrid>
         <controls:CodeViewer.SourceCodes>
             <controls:SourceCodeModel 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/StarrySkyExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/StarrySkyExample.xaml
index b2074cc8..097f5f76 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/StarrySkyExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/StarrySkyExample.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
@@ -19,16 +19,16 @@
             <Setter Property="Margin" Value="2"></Setter>
         </Style>
         <Style TargetType="{x:Type TextBox}" BasedOn="{StaticResource {x:Type TextBox}}">
-            <Setter Property="wd:ElementHelper.Watermark" Value="输入内容"></Setter>
+            <Setter Property="wpfdev:ElementHelper.Watermark" Value="输入内容"></Setter>
             <Setter Property="Margin" Value="-30,0"></Setter>
             <Setter Property="Width" Value="100"></Setter>
         </Style>
     </UserControl.Resources>
     <controls:CodeViewer>
     <Grid>
-        <wd:StarrySky Name="myStarrySky">
+        <wpfdev:StarrySky Name="myStarrySky">
 
-        </wd:StarrySky>
+        </wpfdev:StarrySky>
         <StackPanel HorizontalAlignment="Left" VerticalAlignment="Top">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="星星个数:"></TextBlock>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/TaskbarItemInfoExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/TaskbarItemInfoExample.xaml
index b466ff25..833bfb25 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/TaskbarItemInfoExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/TaskbarItemInfoExample.xaml
@@ -1,11 +1,11 @@
-<wd:Window
+<wpfdev:Window
     x:Class="WPFDevelopers.Samples.ExampleViews.TaskbarItemInfoExample"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:WPFDevelopers.Samples"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+    xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
     Title="TaskbarItemInfoExample"
     Width="363"
     Height="211"
@@ -50,4 +50,4 @@
             Style="{StaticResource WD.SuccessPrimaryButton}"
             Tag="remove" />
     </WrapPanel>
-</wd:Window>
+</wpfdev:Window>
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/ThermometerExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/ThermometerExample.xaml
index f7e56d9b..443ebb76 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/ThermometerExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/ThermometerExample.xaml
@@ -3,7 +3,7 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
              mc:Ignorable="d" 
@@ -31,7 +31,7 @@
                           Stroke="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}"
                           StrokeThickness="1" Opacity=".6"
                           Data="{Binding ElementName=PART_Thermometer, Path=CurrentGeometry,Mode=TwoWay}"/>
-                    <wd:Thermometer x:Name="PART_Thermometer"
+                    <wpfdev:Thermometer x:Name="PART_Thermometer"
                                         CurrentValue="{Binding ElementName=PART_Slider,Path=Value,Mode=TwoWay}"/>
                 </Grid>
                 <TextBlock Text="{Binding ElementName=PART_Thermometer,Path=CurrentValue,StringFormat={}{0}℃}" 
diff --git a/src/WPFDevelopers.Samples.Shared/ExampleViews/VerifyCodeExample.xaml b/src/WPFDevelopers.Samples.Shared/ExampleViews/VerifyCodeExample.xaml
index 68fe0be9..5c18dbb2 100644
--- a/src/WPFDevelopers.Samples.Shared/ExampleViews/VerifyCodeExample.xaml
+++ b/src/WPFDevelopers.Samples.Shared/ExampleViews/VerifyCodeExample.xaml
@@ -4,7 +4,7 @@
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              xmlns:local="clr-namespace:WPFDevelopers.Samples.ExampleViews"
-             xmlns:wd="https://github.com/WPFDevelopersOrg/WPFDevelopers"
+             xmlns:wpfdev="https://github.com/WPFDevelopersOrg/WPFDevelopers"
              xmlns:controls="clr-namespace:WPFDevelopers.Samples.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800">
@@ -20,10 +20,10 @@
                     Click="Button_Click"
                     Content="获取"/>
             <UniformGrid Rows="2" Columns="2" Grid.Row="1">
-                <wd:VerifyCode Foreground="LimeGreen" Name="VerifyCode1"/>
-                <wd:VerifyCode Foreground="Red" Name="VerifyCode2"/>
-                <wd:VerifyCode Foreground="DodgerBlue" Name="VerifyCode3"/>
-                <wd:VerifyCode Foreground="HotPink" Name="VerifyCode4"/>
+                <wpfdev:VerifyCode Foreground="LimeGreen" Name="VerifyCode1"/>
+                <wpfdev:VerifyCode Foreground="Red" Name="VerifyCode2"/>
+                <wpfdev:VerifyCode Foreground="DodgerBlue" Name="VerifyCode3"/>
+                <wpfdev:VerifyCode Foreground="HotPink" Name="VerifyCode4"/>
             </UniformGrid>
         </Grid>
         <controls:CodeViewer.SourceCodes>
diff --git a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
index e9b21987..a05067e1 100644
--- a/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
+++ b/src/WPFDevelopers.Samples.Shared/Helpers/MenuEnum.cs
@@ -38,8 +38,8 @@ public enum MenuEnum
         TransitionPanel,
         SpotLight,
         DrawerMenu,
-        ChartRadar,
-        ChartBar,
+        RadarChart,
+        BasicBarChart,
         ZooSemy,
         RulerControl,
         RainbowBtn,
@@ -80,8 +80,6 @@ public enum MenuEnum
         IPEditBox,
         TimePicker,
         WaterfallPanel,
-        ChartLine,
-        Drap,
         VirtualizingWrapPanel,
         AcrylicBlur,
         TaskbarInfo
diff --git a/src/WPFDevelopers.Samples.Shared/Models/NavigateMenuModel.cs b/src/WPFDevelopers.Samples.Shared/Models/NavigateMenuModel.cs
index eaa3dae6..6ded4048 100644
--- a/src/WPFDevelopers.Samples.Shared/Models/NavigateMenuModel.cs
+++ b/src/WPFDevelopers.Samples.Shared/Models/NavigateMenuModel.cs
@@ -1,17 +1,7 @@
 namespace WPFDevelopers.Samples.Models
 {
-    public class NavigateMenuModel:ViewModelBase
+    public class NavigateMenuModel
     {
-        private bool _isVisible = true;
         public string Name { get; set; }
-        public bool IsVisible
-        {
-            get { return _isVisible; }
-            set
-            {
-                _isVisible = value;
-                NotifyPropertyChange("IsVisible");
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
index d873cb5b..00ff9811 100644
--- a/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
+++ b/src/WPFDevelopers.Samples.Shared/ViewModels/MainVM.cs
@@ -1,8 +1,5 @@
-using Microsoft.Expression.Drawing.Core;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Collections.ObjectModel;
-using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -21,11 +18,11 @@
 
 namespace WPFDevelopers.Samples.ViewModels
 {
-    public class MainVM : ViewModelBase
+    public class MainVM:ViewModelBase
     {
-        private IList<NavigateMenuModel> _navigateMenuModelList;
+        private ObservableCollection<ListBoxItem> _navigateMenuModelList;
 
-        public IList<NavigateMenuModel> NavigateMenuModelList
+        public ObservableCollection<ListBoxItem> NavigateMenuModelList
         {
             get { return _navigateMenuModelList; }
             set { _navigateMenuModelList = value; }
@@ -41,7 +38,7 @@ public NavigateMenuModel NavigateMenuItem
             set
             {
                 _navigateMenuItem = value;
-                NotifyPropertyChange("NavigateMenuItem");
+                this.NotifyPropertyChange("NavigateMenuItem");
             }
         }
         private object _controlPanel;
@@ -54,54 +51,32 @@ public object ControlPanel
             set
             {
                 _controlPanel = value;
-                NotifyPropertyChange("ControlPanel");
+                this.NotifyPropertyChange("ControlPanel");
             }
         }
         public MainVM()
         {
-            NavigateMenuModelList = new ObservableCollection<NavigateMenuModel>();
+            NavigateMenuModelList = new ObservableCollection<ListBoxItem>();
             foreach (MenuEnum menuEnum in Enum.GetValues(typeof(MenuEnum)))
             {
-                NavigateMenuModelList.Add(new NavigateMenuModel { Name = menuEnum.ToString() });
+                NavigateMenuModelList.Add(new ListBoxItem { Content = menuEnum.ToString() });
             }
-            NavigateMenuModelList.Add(new NavigateMenuModel { Name = "持续更新中" });
+            NavigateMenuModelList.Add(new ListBoxItem { Content = "持续更新中" });
             ControlPanel = new AnimationNavigationBar3DExample();
         }
-
         public ICommand ViewLoaded => new RelayCommand(obj =>
         {
-
+           
 
         });
-
-        public ICommand MenuSearchTextChanged => new RelayCommand(obj =>
-        {
-            var search = obj.ToString();
-            if (string.IsNullOrEmpty(search))
-            {
-                NavigateMenuModelList.ForEach(y => y.IsVisible = true);
-            }
-            else
-            {
-                var key = search.ToLower();
-                foreach (var item in NavigateMenuModelList)
-                {
-                    if (item.Name.ToLower().Contains(key))
-                        item.IsVisible = true;
-                    else
-                        item.IsVisible = false;
-                }
-            }
-        });
-
         public ICommand MenuSelectionChangedCommand => new RelayCommand(obj =>
         {
             if (obj == null) return;
-            var model = obj as NavigateMenuModel;
-            MenuItemSelection(model.Name);
+            var model = obj as ListBoxItem;
+            MenuItemSelection(model.Content.ToString());
         });
 
-        public ICommand CloseCommand => new RelayCommand(obj =>
+        public ICommand CloseCommand => new RelayCommand( obj => 
         {
             Application.Current.MainWindow.Close();
         });
@@ -112,7 +87,7 @@ void MenuItemSelection(string _menuName)
             MenuEnum flag;
             if (!Enum.TryParse<MenuEnum>(_menuName, true, out flag))
                 return;
-            var menuEnum = (MenuEnum)Enum.Parse(typeof(MenuEnum), _menuName, true);
+            var menuEnum = (MenuEnum)Enum.Parse(typeof(MenuEnum), _menuName,true);
             switch (menuEnum)
             {
                 case MenuEnum.Navigation3D:
@@ -163,7 +138,7 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.BreatheLight:
                     ControlPanel = new BreatheLightExample();
                     break;
-
+               
                 case MenuEnum.ChatEmoji:
                     ControlPanel = new ChatEmojiExample();
                     break;
@@ -209,8 +184,8 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.DrawerMenu:
                     ControlPanel = new DrawerMenuExample();
                     break;
-                case MenuEnum.ChartRadar:
-                    ControlPanel = new ChartRadarExample();
+                case MenuEnum.RadarChart:
+                    ControlPanel = new RadarChartExample();
                     break;
                 case MenuEnum.LoginWindow:
                     ControlPanel = new LoginExample();
@@ -220,8 +195,8 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.Pagination:
                     ControlPanel = new PaginationExample();
                     break;
-                case MenuEnum.ChartBar:
-                    ControlPanel = new ChartBarExample();
+                case MenuEnum.BasicBarChart:
+                    ControlPanel = new BasicBarChartExample();
                     break;
                 case MenuEnum.ZooSemy:
                     ControlPanel = new ZooSemyExample();
@@ -343,12 +318,6 @@ void MenuItemSelection(string _menuName)
                 case MenuEnum.WaterfallPanel:
                     ControlPanel = new WaterfallPanelExample();
                     break;
-                case MenuEnum.ChartLine:
-                    ControlPanel = new ChartLineExample();
-                    break;
-                case MenuEnum.Drap:
-                    ControlPanel = new DrapViewExample();
-                    break;
                 case MenuEnum.VirtualizingWrapPanel:
                     ControlPanel = new VirtualizingWrapPanel();
                     new VirtualizingWrapPanelExample().MaskShowDialog();
@@ -370,5 +339,5 @@ void MenuItemSelection(string _menuName)
 
 
 
-    }
+     }
 }
diff --git a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
index 798e7ea1..86ad8dcf 100644
--- a/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
+++ b/src/WPFDevelopers.Samples.Shared/WPFDevelopers.Samples.Shared.projitems
@@ -25,7 +25,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Dashboard\ScaleItem.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Drawing\DrawingControl.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Drawing\DrawingPanel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\NavigateMenu\NavigateMenu.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TransformLayout\ElementAdorner.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TransformLayout\ThumbAngle.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\TransformLayout\TransformLayout.cs" />
@@ -70,9 +69,9 @@
       <SubType>Code</SubType>
       <DependentUpon>BarrageExample.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ChartBarExample.xaml.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\BasicBarChartExample.xaml.cs">
       <SubType>Code</SubType>
-      <DependentUpon>ChartBarExample.xaml</DependentUpon>
+      <DependentUpon>BasicBarChartExample.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\BasicControlsExample.xaml.cs">
       <SubType>Code</SubType>
@@ -104,9 +103,6 @@
       <SubType>Code</SubType>
       <DependentUpon>CarouselExampleEx.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ChartLineExample.xaml.cs">
-      <DependentUpon>ChartLineExample.xaml</DependentUpon>
-    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ChatEmojiExample.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>ChatEmojiExample.xaml</DependentUpon>
@@ -158,17 +154,6 @@
       <SubType>Code</SubType>
       <DependentUpon>DesktopPlayVideo.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DrapView\Controls\ElementAdorner.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DrapView\Controls\ThumbAdorner.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DrapView\Controls\ThumbAdorner2.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DrapView\Controls\ThumbAngle.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DrapView\Controls\TransformThumb.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DrapView\Datas\PrintState.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DrapView\Datas\ShapeType.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DrapView\Datas\ThumbType.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DrapView\DrapViewExample.xaml.cs">
-      <DependentUpon>DrapViewExample.xaml</DependentUpon>
-    </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\DrawerMenu\DrawerMenuExample.xaml.cs">
       <SubType>Code</SubType>
       <DependentUpon>DrawerMenuExample.xaml</DependentUpon>
@@ -333,9 +318,9 @@
       <SubType>Code</SubType>
       <DependentUpon>PieControlExample.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\ChartRadarExample.xaml.cs">
+    <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\RadarChartExample.xaml.cs">
       <SubType>Code</SubType>
-      <DependentUpon>ChartRadarExample.xaml</DependentUpon>
+      <DependentUpon>RadarChartExample.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)ExampleViews\RainbowButtonsExample.xaml.cs">
       <SubType>Code</SubType>
@@ -488,10 +473,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\NavigateMenu\NavigateMenu.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Controls\TransformLayout\TransformLayout.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -548,7 +529,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\ChartBarExample.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\BasicBarChartExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
@@ -580,10 +561,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\ChartLineExample.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\ChatEmojiExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -636,14 +613,6 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\DrapView\Controls\TransformThumb.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\DrapView\DrapViewExample.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ExampleViews\DrawerMenu\DrawerMenuExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -829,7 +798,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\ChartRadarExample.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)ExampleViews\RadarChartExample.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj b/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
index c891665f..6b43b722 100644
--- a/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
+++ b/src/WPFDevelopers.Samples40/WPFDevelopers.Samples40.csproj
@@ -11,7 +11,9 @@
 		</BootstrapperPackage>
 	</ItemGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\WPFDevelopers.Net40\WPFDevelopers.Net40.csproj" />
+	  <PackageReference Include="WPFDevelopers" Version="1.1.0.2-preview6" />
+	</ItemGroup>
+	<ItemGroup>
 		<ProjectReference Include="..\WPFDevelopers.SamplesCode\WPFDevelopers.SamplesCode.csproj" />
 	</ItemGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj b/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
index 161ae3e3..8077602b 100644
--- a/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
+++ b/src/WPFDevelopers.Samples45x/WPFDevelopers.Samples45x.csproj
@@ -2,7 +2,9 @@
 	<Import Project="../Resources.props" />
 	<Import Project="../TargetFrameworks.props" />
 	<ItemGroup>
-		<ProjectReference Include="..\WPFDevelopers.Net45x\WPFDevelopers.Net45x.csproj" />
+	  <PackageReference Include="WPFDevelopers" Version="1.1.0.2-preview6" />
+	</ItemGroup>
+	<ItemGroup>
 		<ProjectReference Include="..\WPFDevelopers.SamplesCode\WPFDevelopers.SamplesCode.csproj" />
 	</ItemGroup>
 	<Import Project="..\WPFDevelopers.Samples.Shared\WPFDevelopers.Samples.Shared.projitems" Label="Shared" />
diff --git a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
index 94a94a89..85717037 100644
--- a/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
+++ b/src/WPFDevelopers.SamplesCode/WPFDevelopers.SamplesCode.csproj
@@ -13,7 +13,7 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\AnimationAudioExample.xaml.cs" Link="ExampleViews\AnimationAudioExample.xaml.cs" DependentUpon="AnimationAudioExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\AnimationNavigationBar3DExample.xaml.cs" Link="ExampleViews\AnimationNavigationBar3DExample.xaml.cs" DependentUpon="AnimationNavigationBar3DExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BarrageExample.xaml.cs" Link="ExampleViews\BarrageExample.xaml.cs" DependentUpon="BarrageExample.xaml" />
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartBarExample.xaml.cs" Link="ExampleViews\ChartBarExample.xaml.cs" DependentUpon="ChartBarExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BasicBarChartExample.xaml.cs" Link="ExampleViews\BasicBarChartExample.xaml.cs" DependentUpon="BasicBarChartExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BasicControlsExample.xaml.cs" Link="ExampleViews\BasicControlsExample.xaml.cs" DependentUpon="BasicControlsExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BreatheLightExample.xaml.cs" Link="ExampleViews\BreatheLightExample.xaml.cs" DependentUpon="BreatheLightExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BubblleControlExample.xaml.cs" Link="ExampleViews\BubblleControlExample.xaml.cs" DependentUpon="BubblleControlExample.xaml" />
@@ -68,7 +68,7 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\Passwrod\PasswordExample.xaml.cs" Link="ExampleViews\Passwrod\PasswordExample.xaml.cs" DependentUpon="PasswordExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\Passwrod\PasswordWithPlainText.xaml.cs" Link="ExampleViews\Passwrod\PasswordWithPlainText.xaml.cs" DependentUpon="PasswordWithPlainText.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\PieControlExample.xaml.cs" Link="ExampleViews\PieControlExample.xaml.cs" DependentUpon="PieControlExample.xaml" />
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartRadarExample.xaml.cs" Link="ExampleViews\ChartRadarExample.xaml.cs" DependentUpon="ChartRadarExample.xaml" />
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\RadarChartExample.xaml.cs" Link="ExampleViews\RadarChartExample.xaml.cs" DependentUpon="RadarChartExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\RainbowButtonsExample.xaml.cs" Link="ExampleViews\RainbowButtonsExample.xaml.cs" DependentUpon="RainbowButtonsExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\RoundPickerExample.xaml.cs" Link="ExampleViews\RoundPickerExample.xaml.cs" DependentUpon="RoundPickerExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\RulerControlExample.xaml.cs" Link="ExampleViews\RulerControlExample.xaml.cs" DependentUpon="RulerControlExample.xaml" />
@@ -143,7 +143,6 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\IPEditBoxExample.xaml.cs" Link="ExampleViews\TransformLayoutExample.xaml.cs" DependentUpon="TransformLayoutExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\TimePickerExample.xaml.cs" Link="ExampleViews\TimePickerExample.xaml.cs" DependentUpon="TimePickerExample.xaml" />
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\WaterfallPanelExample.xaml.cs" Link="ExampleViews\WaterfallPanelExample.xaml.cs" DependentUpon="WaterfallPanelExample.xaml" />
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartLineExample.xaml.cs" Link="ExampleViews\ChartLineExample.xaml.cs" DependentUpon="ChartLineExample.xaml" />
 	</ItemGroup>
 	<ItemGroup>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\AboutWindow.xaml">
@@ -161,8 +160,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BarrageExample.xaml">
 			<Link>ExampleViews\BarrageExample.xaml</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartBarExample.xaml">
-			<Link>ExampleViews\ChartBarExample.xaml</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BasicBarChartExample.xaml">
+			<Link>ExampleViews\BasicBarChartExample.xaml</Link>
 		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\BasicControlsExample.xaml">
 			<Link>ExampleViews\BasicControlsExample.xaml</Link>
@@ -317,8 +316,8 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\PieControlExample.xaml">
 			<Link>ExampleViews\PieControlExample.xaml</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartRadarExample.xaml">
-			<Link>ExampleViews\ChartRadarExample.xaml</Link>
+		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\RadarChartExample.xaml">
+			<Link>ExampleViews\RadarChartExample.xaml</Link>
 		</Resource>
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\RainbowButtonsExample.xaml">
 			<Link>ExampleViews\RainbowButtonsExample.xaml</Link>
@@ -485,8 +484,5 @@
 		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\WaterfallPanelExample.xaml">
 			<Link>ExampleViews\WaterfallPanelExample.xaml</Link>
 		</Resource>
-		<Resource Include="..\WPFDevelopers.Samples.Shared\ExampleViews\ChartLineExample.xaml">
-			<Link>ExampleViews\ChartLineExample.xaml</Link>
-		</Resource>
 	</ItemGroup>
 </Project>
diff --git a/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3D.cs b/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3D.cs
index 9a60824f..48ce751c 100644
--- a/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3D.cs
+++ b/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3D.cs
@@ -3,20 +3,29 @@
 
 namespace WPFDevelopers.Controls
 {
-    public class AnimationNavigationBar3D : ListBox
+    public class AnimationNavigationBar3D : ItemsControl
     {
+        public static readonly DependencyProperty ColumnsProperty =
+            DependencyProperty.Register("Columns", typeof(int), typeof(AnimationNavigationBar3D),
+                new PropertyMetadata(null));
+
         static AnimationNavigationBar3D()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(AnimationNavigationBar3D),
                 new FrameworkPropertyMetadata(typeof(AnimationNavigationBar3D)));
         }
-        protected override bool IsItemItsOwnContainerOverride(object item)
+
+
+        public int Columns
         {
-            return item is AnimationNavigationBar3DItem;
+            get => (int)GetValue(ColumnsProperty);
+            set => SetValue(ColumnsProperty, value);
         }
-        protected override DependencyObject GetContainerForItemOverride()
+
+        public override void OnApplyTemplate()
         {
-            return new AnimationNavigationBar3DItem();
+            base.OnApplyTemplate();
+            Columns = Items.Count;
         }
     }
 }
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3DItem.cs b/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3DItem.cs
index dd1444d0..d717cbad 100644
--- a/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3DItem.cs
+++ b/src/WPFDevelopers.Shared/Controls/AnimationNavigationBar3D/AnimationNavigationBar3DItem.cs
@@ -1,49 +1,69 @@
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
-using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Controls
 {
-    public class AnimationNavigationBar3DItem : ListBoxItem
+    public class AnimationNavigationBar3DItem : Control
     {
-        public static readonly DependencyProperty FillProperty =
-            DependencyProperty.Register("Fill", typeof(Brush), typeof(AnimationNavigationBar3DItem),
+        public static readonly DependencyProperty FileBackgroundProperty =
+            DependencyProperty.Register("FileBackground", typeof(Brush), typeof(AnimationNavigationBar3DItem),
                 new PropertyMetadata(null));
 
-        public static readonly DependencyProperty ContentBackProperty =
-            DependencyProperty.Register("ContentBack", typeof(object), typeof(AnimationNavigationBar3DItem),
+        public static readonly DependencyProperty BackFileBackgroundProperty =
+            DependencyProperty.Register("BackFileBackground", typeof(Brush), typeof(AnimationNavigationBar3DItem),
                 new PropertyMetadata(null));
 
+        public static readonly DependencyProperty PathDateProperty =
+            DependencyProperty.Register("PathDate", typeof(Geometry), typeof(AnimationNavigationBar3DItem),
+                new PropertyMetadata());
+
+        public static readonly DependencyProperty TextProperty =
+            DependencyProperty.Register("Text", typeof(string), typeof(AnimationNavigationBar3DItem),
+                new PropertyMetadata());
+
         static AnimationNavigationBar3DItem()
         {
             DefaultStyleKeyProperty.OverrideMetadata(typeof(AnimationNavigationBar3DItem),
                 new FrameworkPropertyMetadata(typeof(AnimationNavigationBar3DItem)));
         }
 
-        public override void OnApplyTemplate()
+        /// <summary>
+        ///     默认颜色
+        /// </summary>
+        public Brush FileBackground
         {
-            base.OnApplyTemplate();
-            if (ContentBack == null) 
-                ContentBack = ControlsHelper.GetXmlReader(Content);
+            get => (Brush)GetValue(FileBackgroundProperty);
+            set => SetValue(FileBackgroundProperty, value);
         }
 
         /// <summary>
-        ///  Color fore
+        ///     背面颜色
         /// </summary>
-        public Brush Fill
+        public Brush BackFileBackground
         {
-            get => (Brush)GetValue(FillProperty);
-            set => SetValue(FillProperty, value);
+            get => (Brush)GetValue(BackFileBackgroundProperty);
+            set => SetValue(BackFileBackgroundProperty, value);
         }
 
+
+        /// <summary>
+        ///     设置PathData
+        /// </summary>
+        public Geometry PathDate
+        {
+            get => (Geometry)GetValue(PathDateProperty);
+            set => SetValue(PathDateProperty, value);
+        }
+
+
         /// <summary>
-        ///  The content after the mouse is moved in
+        ///     文本显示内容
         /// </summary>
-        public object ContentBack
+        public string Text
         {
-            get => (object)GetValue(ContentBackProperty);
-            set => SetValue(ContentBackProperty, value);
+            get => (string)GetValue(TextProperty);
+            set => SetValue(TextProperty, value);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/BaseControls/SliderRepeatButton.cs b/src/WPFDevelopers.Shared/Controls/BaseControls/SliderRepeatButton.cs
deleted file mode 100644
index fd744614..00000000
--- a/src/WPFDevelopers.Shared/Controls/BaseControls/SliderRepeatButton.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-
-namespace WPFDevelopers.Controls
-{
-    public class SliderRepeatButton: RepeatButton
-    {
-        public RadiusOrientation RadiusOrientation
-        {
-            get { return (RadiusOrientation)GetValue(RadiusOrientationProperty); }
-            set { SetValue(RadiusOrientationProperty, value); }
-        }
-
-        public static readonly DependencyProperty RadiusOrientationProperty =
-            DependencyProperty.Register("RadiusOrientation", typeof(RadiusOrientation), typeof(SliderRepeatButton), new PropertyMetadata(null));
-
-    }
-
-    [Localizability(LocalizationCategory.None, Readability = Readability.Unreadable)]
-    public enum RadiusOrientation
-    {
-        Down = ExpandDirection.Down,
-        Up = ExpandDirection.Up,
-        Left = ExpandDirection.Left,
-        Right = ExpandDirection.Right,
-        TopLeft,
-        TopRight,
-        BottomRight,
-        BottomLeft
-    }
-}
diff --git a/src/WPFDevelopers.Shared/Controls/BaseControls/WDBorder.cs b/src/WPFDevelopers.Shared/Controls/BaseControls/WDBorder.cs
deleted file mode 100644
index f1aeb116..00000000
--- a/src/WPFDevelopers.Shared/Controls/BaseControls/WDBorder.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-using WPFDevelopers.Helpers;
-
-namespace WPFDevelopers.Controls
-{
-    public class WDBorder : Border
-    {
-        public Geometry ContentClip
-        {
-            get
-            {
-                return (Geometry)GetValue(ContentClipProperty);
-            }
-            set
-            {
-                SetValue(ContentClipProperty, value);
-            }
-        }
-
-        private Geometry CalculateContentClip()
-        {
-            var borderThickness = BorderThickness;
-            var cornerRadius = CornerRadius;
-            var renderSize = RenderSize;
-            var width = renderSize.Width - borderThickness.Left - borderThickness.Right;
-            var height = renderSize.Height - borderThickness.Top - borderThickness.Bottom;
-            if (width > 0.0 && height > 0.0)
-            {
-                var rect = new Rect(0.0, 0.0, width, height);
-                var radii = new GeometryHelper.Radii(cornerRadius, borderThickness, false);
-                var streamGeometry = new StreamGeometry();
-                using (StreamGeometryContext streamGeometryContext = streamGeometry.Open())
-                {
-                    GeometryHelper.GenerateGeometry(streamGeometryContext, rect, radii);
-                    streamGeometry.Freeze();
-                    return streamGeometry;
-                }
-            }
-            return null;
-        }
-
-        protected override void OnRender(DrawingContext dc)
-        {
-            SetValue(ContentClipPropertyKey, CalculateContentClip());
-            base.OnRender(dc);
-        }
-
-        public static readonly DependencyPropertyKey ContentClipPropertyKey = 
-            DependencyProperty.RegisterReadOnly("ContentClip", typeof(Geometry), typeof(WDBorder), new PropertyMetadata(null));
-
-        public static readonly DependencyProperty ContentClipProperty = ContentClipPropertyKey.DependencyProperty;
-        
-    }
-}
diff --git a/src/WPFDevelopers.Shared/Controls/BasicBarChart/BasicBarChart.cs b/src/WPFDevelopers.Shared/Controls/BasicBarChart/BasicBarChart.cs
new file mode 100644
index 00000000..cac5be86
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/BasicBarChart/BasicBarChart.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Media;
+using WPFDevelopers.Helpers;
+
+namespace WPFDevelopers.Controls
+{
+    public class BasicBarChart : Control
+    {
+        public static readonly DependencyProperty SeriesArrayProperty =
+            DependencyProperty.Register("SeriesArray", typeof(IEnumerable<KeyValuePair<string, double>>),
+                typeof(BasicBarChart), new UIPropertyMetadata(SeriesArrayChanged));
+
+
+        static BasicBarChart()
+        {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(BasicBarChart),
+                new FrameworkPropertyMetadata(typeof(BasicBarChart)));
+        }
+
+        public IEnumerable<KeyValuePair<string, double>> SeriesArray
+        {
+            get => (IEnumerable<KeyValuePair<string, double>>)GetValue(SeriesArrayProperty);
+            set => SetValue(SeriesArrayProperty, value);
+        }
+
+        private static void SeriesArrayChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var radarChart = d as BasicBarChart;
+            if (e.NewValue != null)
+                radarChart.InvalidateVisual();
+        }
+
+        protected override void OnRender(DrawingContext drawingContext)
+        {
+            base.OnRender(drawingContext);
+            if (SeriesArray == null || SeriesArray.Count() == 0)
+                return;
+            SnapsToDevicePixels = true;
+            UseLayoutRounding = true;
+            var brushConverter = new BrushConverter();
+            var myPen = new Pen
+            {
+                Thickness = 1,
+                Brush = (Brush)brushConverter.ConvertFromString("#6E7079")
+            };
+            myPen.Freeze();
+
+            var h = ActualHeight / 2 + 160;
+            var w = ActualWidth / 2;
+            var startX = 0;
+            var width = SeriesArray.Count() * 120 + startX;
+            var stratNum = 0;
+
+            drawingContext.DrawSnappedLinesBetweenPoints(myPen, myPen.Thickness, new Point(startX, h),
+                new Point(width, h));
+            var formattedText = DrawingContextHelper.GetFormattedText(stratNum.ToString(),
+                (Brush)brushConverter.ConvertFromString("#6E7079"), FlowDirection.LeftToRight);
+            drawingContext.DrawText(formattedText,
+                new Point(startX - formattedText.Width * 2 - 10, h - formattedText.Height / 2));
+            var x = startX;
+            var y = h + myPen.Thickness;
+            var points = new List<Point>();
+            var rectBrush = ControlsHelper.PrimaryNormalBrush;
+            for (var i = 0; i < SeriesArray.Count() + 1; i++)
+            {
+                points.Add(new Point(x, y));
+                points.Add(new Point(x, y + 4));
+                x = x + 120;
+            }
+
+            drawingContext.DrawSnappedLinesBetweenPoints(myPen, myPen.Thickness, points.ToArray());
+
+            var xAxisPen = new Pen
+            {
+                Thickness = 1,
+                Brush = (Brush)brushConverter.ConvertFromString("#E0E6F1")
+            };
+            xAxisPen.Freeze();
+            var xAxis = h - 80;
+            var max = Convert.ToInt32(SeriesArray.Max(kvp => kvp.Value));
+            max = (max / 50 + (max % 50 == 0 ? 0 : 1)) * 50 / 50;
+            var min = Convert.ToInt32(SeriesArray.Min(kvp => kvp.Value));
+            points.Clear();
+            for (var i = 0; i < max; i++)
+            {
+                points.Add(new Point(startX, xAxis));
+                points.Add(new Point(width, xAxis));
+                stratNum += 50;
+                formattedText = DrawingContextHelper.GetFormattedText(stratNum.ToString(),
+                    (Brush)brushConverter.ConvertFromString("#6E7079"), FlowDirection.LeftToRight);
+                drawingContext.DrawText(formattedText,
+                    new Point(startX - formattedText.Width - 10, xAxis - formattedText.Height / 2));
+                xAxis = xAxis - 80;
+            }
+
+            drawingContext.DrawSnappedLinesBetweenPoints(xAxisPen, xAxisPen.Thickness, points.ToArray());
+
+            x = startX;
+            var rectWidth = 85;
+            var rectHeight = 0D;
+            for (var i = 0; i < SeriesArray.Count(); i++)
+            {
+                formattedText = DrawingContextHelper.GetFormattedText(SeriesArray.ToList()[i].Key,
+                    (Brush)brushConverter.ConvertFromString("#6E7079"), FlowDirection.LeftToRight);
+                drawingContext.DrawText(formattedText, new Point(x + 120 / 2 - formattedText.Width / 2, y + 4));
+                var _value = SeriesArray.ToList()[i].Value;
+                rectHeight = (_value - 0) / (stratNum - 0) * (80 * max);
+                drawingContext.DrawRectangle(rectBrush, null,
+                    new Rect(x + (120 - 85) / 2, h - rectHeight, rectWidth, rectHeight));
+                x = x + 120;
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs
deleted file mode 100644
index dc764aec..00000000
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartBar.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Collections.Generic;
-using System.Windows;
-using System.Windows.Media;
-
-namespace WPFDevelopers.Controls
-{
-    public class ChartBar : ChartRect
-    {
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            base.OnRender(drawingContext);
-            var dicts = new Dictionary<Rect, string>();
-            var x = StartX;
-            var rectWidth = 85;
-            var interval = Interval;
-            foreach (var item in Datas)
-            {
-                var formattedText = DrawingContextHelper.GetFormattedText(item.Key,
-                    ChartFill, FlowDirection.LeftToRight);
-                drawingContext.DrawText(formattedText, new Point(x + interval / 2 - formattedText.Width / 2, StartY + 4));
-                var _value = item.Value;
-                var rectHeight = (_value - 0) / (IntervalY - 0) * (ScaleFactor * Rows);
-                var rect = new Rect(x + (interval - rectWidth) / 2, StartY - rectHeight, rectWidth, rectHeight);
-                drawingContext.DrawRectangle(NormalBrush, null, rect);
-                x += interval;
-                var nRect = new Rect(rect.Left - EllipsePadding, rect.Top - EllipsePadding, rect.Width + EllipsePadding, rect.Height + EllipsePadding);
-                dicts.Add(nRect, $"{item.Key} : {item.Value}");
-            }
-            PointCache = dicts;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartBase.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartBase.cs
deleted file mode 100644
index cc3bfb86..00000000
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartBase.cs
+++ /dev/null
@@ -1,150 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Effects;
-using WPFDevelopers.Helpers;
-
-namespace WPFDevelopers.Controls
-{
-    public class ChartBase : Control
-    {
-        private Popup _popup;
-        private Border _border;
-        private TextBlock _textBlock;
-        public IDictionary<Rect, string> PointCache;
-        private bool isPopupOpen = false;
-        private KeyValuePair<Rect, string> _lastItem;
-
-        public static readonly DependencyProperty DatasProperty =
-            DependencyProperty.Register("Datas", typeof(IEnumerable<KeyValuePair<string, double>>),
-                typeof(ChartBase), new UIPropertyMetadata(DatasChanged));
-
-        static ChartBase()
-        {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(ChartBase),
-                new FrameworkPropertyMetadata(typeof(ChartBase)));
-        }
-
-        protected double EllipseSize { get; } = 7;
-        protected double EllipsePadding{ get; } = 20;
-        protected double Rows { get; } = 5;
-
-        protected double Interval { get; } = 120;
-
-        protected double MaxY { get; }
-        protected double StartY { get; set; }
-        protected double StartX { get; set; } = 40;
-
-        protected Brush NormalBrush => ControlsHelper.PrimaryNormalBrush;
-
-
-        public IEnumerable<KeyValuePair<string, double>> Datas
-        {
-            get => (IEnumerable<KeyValuePair<string, double>>) GetValue(DatasProperty);
-            set => SetValue(DatasProperty, value);
-        }
-
-        private static void DatasChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var ctrl = d as ChartBase;
-            if (e.NewValue != null)
-                ctrl.InvalidateVisual();
-        }
-        protected override void OnMouseMove(MouseEventArgs e)
-        {
-            base.OnMouseMove(e);
-            if (Datas == null || Datas.Count() == 0 || isPopupOpen)
-                return;
-            if (_popup == null)
-            {
-                _popup = new Popup
-                {
-                    AllowsTransparency = true,
-                    Placement = PlacementMode.MousePoint,
-                    PlacementTarget = this,
-                    StaysOpen = false,
-                };
-                _popup.MouseMove += (y, j) =>
-                {
-                    var point = j.GetPosition(this);
-                    if (isPopupOpen && _lastItem.Value != null)
-                    {
-                        if (!_lastItem.Key.Contains(point))
-                        {
-                            _popup.IsOpen = false;
-                            isPopupOpen = false;
-                            _lastItem = new KeyValuePair<Rect, string>();
-                        }
-                    }
-                };
-                _popup.Closed += delegate
-                {
-                    isPopupOpen = false;
-                };
-                _textBlock = new TextBlock()
-                {
-                    HorizontalAlignment = HorizontalAlignment.Center,
-                    VerticalAlignment = VerticalAlignment.Center,
-                    Foreground = (Brush)Application.Current.TryFindResource("WD.WindowForegroundColorBrush")
-                };
-                _border = new Border
-                {
-                    Child = _textBlock,
-                    Background = (Brush)Application.Current.TryFindResource("WD.ChartFillSolidColorBrush"),
-                    Effect = Application.Current.TryFindResource("WD.PopupShadowDepth") as DropShadowEffect,
-                    Margin = new Thickness(10),
-                    CornerRadius = new CornerRadius(3),
-                    Padding = new Thickness(6)
-                };
-                _popup.Child = _border;
-            }
-            if (PointCache == null) return;
-            var currentPoint = e.GetPosition(this);
-            if (PointCache.Any(x => x.Key.Contains(currentPoint)))
-            {
-                isPopupOpen = true;
-
-                var currentItem = PointCache.FirstOrDefault(x => x.Key.Contains(currentPoint));
-                if (currentItem.Key == null) return;
-                _textBlock.Text = currentItem.Value;
-                _popup.IsOpen = true;
-                _lastItem = currentItem;
-            }
-        }
-
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            base.OnRender(drawingContext);
-            if (Datas == null || Datas.Count() == 0)
-                return;
-            SnapsToDevicePixels = true;
-            UseLayoutRounding = true;
-        }
-
-        public void DrawEllipse(IEnumerable<Rect> rects, DrawingContext drawingContext)
-        {
-            var drawingPen = new Pen
-            {
-                Thickness = 2,
-                Brush = NormalBrush
-            };
-            drawingPen.Freeze();
-
-            var backgroupBrush = new SolidColorBrush()
-            {
-                Color = (Color)Application.Current.TryFindResource("WD.BackgroundColor")
-            };
-            backgroupBrush.Freeze();
-            foreach (var item in rects)
-            {
-                var ellipseGeom = new EllipseGeometry(item);
-                drawingContext.DrawGeometry(backgroupBrush, drawingPen, ellipseGeom);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs
deleted file mode 100644
index 21302a93..00000000
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartLine.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Windows;
-using System.Windows.Media;
-
-namespace WPFDevelopers.Controls
-{
-    public class ChartLine : ChartRect
-    {
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            if (Datas == null || Datas.Count() == 0)
-                return;
-            base.OnRender(drawingContext);
-            var dicts = new Dictionary<Rect, string>();
-            var rects = new List<Rect>();
-            var points = new List<Point>();
-            var x = StartX;
-            var interval = Interval;
-            var drawingPen = new Pen
-            {
-                Thickness = 2,
-                Brush = NormalBrush
-            };
-            drawingPen.Freeze();
-            var firstDataPoint = Datas.FirstOrDefault();
-            if (firstDataPoint.Equals(default(KeyValuePair<string, double>)))
-                return;
-            double proportion = firstDataPoint.Value / IntervalY;
-            double yPositionFromBottom = StartY - proportion * (ScaleFactor * Rows);
-            var startPoint = new Point(x + Interval / 2, yPositionFromBottom);
-            points.Add(startPoint);
-            foreach (var item in Datas)
-            {
-                var formattedText = DrawingContextHelper.GetFormattedText(item.Key,
-                   ChartFill, FlowDirection.LeftToRight);
-                var point = new Point(x + interval / 2 - formattedText.Width / 2, StartY + 4);
-                drawingContext.DrawText(formattedText, point);
-
-                var y = StartY - (item.Value / IntervalY) * (ScaleFactor * Rows);
-                var endPoint = new Point(x + Interval / 2, y);
-                points.Add(endPoint);
-                drawingContext.DrawLine(drawingPen, startPoint, endPoint);
-                var ellipsePoint = new Point(endPoint.X - EllipseSize / 2, endPoint.Y - EllipseSize / 2);
-                var rect = new Rect(ellipsePoint, new Size(EllipseSize, EllipseSize));
-                rects.Add(rect);
-                startPoint = endPoint;
-                x += interval;
-                var nRect = new Rect(rect.Left - EllipsePadding, rect.Top - EllipsePadding, rect.Width + EllipsePadding, rect.Height + EllipsePadding);
-                dicts.Add(nRect, $"{item.Key} : {item.Value}");
-            }
-            PointCache = dicts;
-            if(points.Count > 1)
-            {
-                var color = (Color)Application.Current.TryFindResource("WD.PrimaryNormalColor");
-                var rectBrush = new SolidColorBrush(color);
-                rectBrush.Opacity = 0.3;
-                rectBrush.Freeze();
-                var streamGeometry = new StreamGeometry();
-                using (StreamGeometryContext geometryContext = streamGeometry.Open())
-                {
-                    var sPoint = new Point(points[0].X, StartY);
-                    geometryContext.BeginFigure(sPoint, true, true);
-
-                    foreach (Point point in points)
-                        geometryContext.LineTo(point, true, true);
-                    var ePoint = new Point(points[points.Count - 1].X, StartY);
-                    geometryContext.LineTo(ePoint, true, true);
-                    geometryContext.Close();
-                }
-                drawingContext.DrawGeometry(rectBrush, null, streamGeometry);
-            }
-            DrawEllipse(rects, drawingContext);
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs
deleted file mode 100644
index bc61817d..00000000
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartRect.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Windows;
-using System.Windows.Media;
-
-namespace WPFDevelopers.Controls
-{
-    public class ChartRect:ChartBase
-    {
-        
-        
-        protected Brush ChartFill { get; private set; }
-        protected double IntervalY { get; private set; }
-        protected short ScaleFactor { get; private set; } = 80;
-        protected override void OnRender(DrawingContext drawingContext)
-        {
-            base.OnRender(drawingContext);
-            ChartFill = Application.Current.TryFindResource("WD.ChartFillSolidColorBrush") as Brush;
-            var myPen = new Pen
-            {
-                Thickness = 1,
-                Brush = ChartFill
-            };
-            myPen.Freeze();
-
-            var xAxiHeight = 4;
-            StartY = ActualHeight - (xAxiHeight + myPen.Thickness) - 20;
-            var w = ActualWidth;
-            StartX = 40;
-            var width = Datas.Count() * Interval + StartX;
-            IntervalY = 0;
-            var x = StartX;
-            var y = StartY + myPen.Thickness;
-
-            drawingContext.DrawSnappedLinesBetweenPoints(myPen, myPen.Thickness, new Point(StartX, StartY),
-                new Point(width, StartY));
-
-            var points = new List<Point>();
-            for (var i = 0; i < Datas.Count() + 1; i++)
-            {
-                points.Add(new Point(x, y));
-                points.Add(new Point(x, y + xAxiHeight));
-                x += Interval;
-            }
-
-            drawingContext.DrawSnappedLinesBetweenPoints(myPen, myPen.Thickness, points.ToArray());
-
-            var formattedText = DrawingContextHelper.GetFormattedText(IntervalY.ToString(),
-                ChartFill, FlowDirection.LeftToRight);
-            drawingContext.DrawText(formattedText,
-                new Point(StartX - formattedText.Width * 2, StartY - formattedText.Height / 2));
-
-            var xAxisPen = new Pen
-            {
-                Thickness = 1,
-                Brush = Application.Current.TryFindResource("WD.ChartXAxisSolidColorBrush") as Brush
-            };
-            xAxisPen.Freeze();
-            var max = Convert.ToInt32(Datas.Max(kvp => kvp.Value));
-            var min = Convert.ToInt32(Datas.Min(kvp => kvp.Value));
-            ScaleFactor = Convert.ToInt16(StartY / Rows);
-            var yAxis = StartY - ScaleFactor;
-            points.Clear();
-            var average = Convert.ToInt32(max / Rows);
-            var result = Enumerable.Range(0, (Convert.ToInt32(max) - average) / average + 1)
-                .Select(i => average + i * average);
-            foreach (var item in result)
-            {
-                points.Add(new Point(StartX, yAxis));
-                points.Add(new Point(width, yAxis));
-                IntervalY = item;
-                formattedText = DrawingContextHelper.GetFormattedText(IntervalY.ToString(),
-                    ChartFill, FlowDirection.LeftToRight);
-                drawingContext.DrawText(formattedText,
-                    new Point(StartX - formattedText.Width - 10, yAxis - formattedText.Height / 2));
-                yAxis -= ScaleFactor;
-            }
-            drawingContext.DrawSnappedLinesBetweenPoints(xAxisPen, xAxisPen.Thickness, points.ToArray());
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartRound.cs b/src/WPFDevelopers.Shared/Controls/Charts/ChartRound.cs
deleted file mode 100644
index 88342af5..00000000
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartRound.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace WPFDevelopers.Controls
-{
-    internal class ChartRound
-    {
-    }
-}
diff --git a/src/WPFDevelopers.Shared/Controls/CropImage/CropImage.cs b/src/WPFDevelopers.Shared/Controls/CropImage/CropImage.cs
index a45c3fd4..27e32570 100644
--- a/src/WPFDevelopers.Shared/Controls/CropImage/CropImage.cs
+++ b/src/WPFDevelopers.Shared/Controls/CropImage/CropImage.cs
@@ -147,8 +147,11 @@ public override void OnApplyTemplate()
         private void DrawImage()
         {
             if (Source == null) return;
-            if (_border.Visibility == Visibility.Collapsed)
+            if (_border.Visibility == Visibility.Visible)
+            {
+                _border.Visibility = Visibility.Collapsed;
                 _border.Visibility = Visibility.Visible;
+            }
             if (adornerLayer != null)
             {
                 adornerLayer.Remove(screenCutAdorner);
diff --git a/src/WPFDevelopers.Shared/Controls/Loading/LoadingExt.cs b/src/WPFDevelopers.Shared/Controls/Loading/LoadingExt.cs
deleted file mode 100644
index b4b42657..00000000
--- a/src/WPFDevelopers.Shared/Controls/Loading/LoadingExt.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-using System.Diagnostics;
-using System.IO;
-using System.Windows;
-
-namespace WPFDevelopers.Controls
-{
-    public class LoadingExt
-    {
-        private Process process;
-
-        public void Show()
-        {
-            if (Helper.GetTempPathVersionExt != null && File.Exists(Helper.GetTempPathVersionExt))
-            {
-                process = new Process();
-                process.StartInfo.FileName = Helper.GetTempPathVersionExt;
-                process.StartInfo.Arguments = $"Loading {Application.Current.MainWindow.Title}"; 
-                process.EnableRaisingEvents = true;
-                process.Exited += (s, x) =>
-                {
-                    process = null;
-                };
-                process.Start();
-            }
-        }
-        public void Close()
-        {
-            if (process != null)
-                process.Kill();
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs b/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
index 64354120..1c2d3212 100644
--- a/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MessageBox/MessageBox.cs
@@ -8,36 +8,36 @@ public static class MessageBox
     {
         public static MessageBoxResult Show(string messageBoxText,Window owner = null)
         {
-            var msg = new WDMessageBox(messageBoxText);
+            var msg = new WPFMessageBox(messageBoxText);
             return GetWindow(msg, owner);
         }
 
         public static MessageBoxResult Show(string messageBoxText, string caption, Window owner = null)
         {
-            var msg = new WDMessageBox(messageBoxText, caption);
+            var msg = new WPFMessageBox(messageBoxText, caption);
             return GetWindow(msg, owner);
         }
 
         public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button, Window owner = null)
         {
-            var msg = new WDMessageBox(messageBoxText, caption, button);
+            var msg = new WPFMessageBox(messageBoxText, caption, button);
             return GetWindow(msg, owner);
         }
 
         public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxImage icon, Window owner = null)
         {
-            var msg = new WDMessageBox(messageBoxText, caption, icon);
+            var msg = new WPFMessageBox(messageBoxText, caption, icon);
             return GetWindow(msg, owner);
         }
 
         public static MessageBoxResult Show(string messageBoxText, string caption, MessageBoxButton button,
             MessageBoxImage icon, Window owner = null)
         {
-            var msg = new WDMessageBox(messageBoxText, caption, button, icon);
+            var msg = new WPFMessageBox(messageBoxText, caption, button, icon);
             return GetWindow(msg, owner);
         }
 
-        private static MessageBoxResult GetWindow(WDMessageBox msg, Window owner = null)
+        private static MessageBoxResult GetWindow(WPFMessageBox msg, Window owner = null)
         {
             msg.WindowStartupLocation = WindowStartupLocation.CenterOwner;
             if (owner != null)
diff --git a/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs b/src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs
similarity index 74%
rename from src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
rename to src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs
index eaa52f7f..0cb1e911 100644
--- a/src/WPFDevelopers.Shared/Controls/MessageBox/WDMessageBox.cs
+++ b/src/WPFDevelopers.Shared/Controls/MessageBox/WPFMessageBox.cs
@@ -16,29 +16,21 @@ namespace WPFDevelopers.Controls
     [TemplatePart(Name = MessageTemplateName, Type = typeof(TextBox))]
     [TemplatePart(Name = ButtonCancelTemplateName, Type = typeof(Button))]
     [TemplatePart(Name = ButtonCancelTemplateName, Type = typeof(Button))]
-    [TemplatePart(Name = ButtonYesTemplateName, Type = typeof(Button))]
-    [TemplatePart(Name = ButtonNoTemplateName, Type = typeof(Button))]
     [TemplatePart(Name = PathTemplateName, Type = typeof(Path))]
-    internal sealed class WDMessageBox : Window
+    internal sealed class WPFMessageBox : Window
     {
         private const string TitleTemplateName = "PART_Title";
         private const string CloseButtonTemplateName = "PART_CloseButton";
         private const string MessageTemplateName = "PART_Message";
         private const string ButtonCancelTemplateName = "PART_ButtonCancel";
         private const string ButtonOKTemplateName = "PART_ButtonOK";
-        private const string ButtonYesTemplateName = "PART_ButtonYes";
-        private const string ButtonNoTemplateName = "PART_ButtonNo";
         private const string PathTemplateName = "PART_Path";
 
         private readonly string _messageString;
         private readonly string _titleString;
         private Button _buttonCancel;
         private Button _buttonOK;
-        private Button _buttonYes;
-        private Button _buttonNo;
         private Visibility _cancelVisibility = Visibility.Collapsed;
-        private Visibility _yesVisibility = Visibility.Collapsed;
-        private Visibility _noVisibility = Visibility.Collapsed;
         private Button _closeButton;
         private Geometry _geometry;
         private TextBox _message;
@@ -49,37 +41,37 @@ internal sealed class WDMessageBox : Window
         private TextBlock _title;
 
 
-        static WDMessageBox()
+        static WPFMessageBox()
         {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(WDMessageBox),
-                new FrameworkPropertyMetadata(typeof(WDMessageBox)));
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(WPFMessageBox),
+                new FrameworkPropertyMetadata(typeof(WPFMessageBox)));
         }
 
-        public WDMessageBox(string message)
+        public WPFMessageBox(string message)
         {
             _messageString = message;
         }
 
-        public WDMessageBox(string message, string caption)
+        public WPFMessageBox(string message, string caption)
         {
             _titleString = caption;
             _messageString = message;
         }
 
-        public WDMessageBox(string message, string caption, MessageBoxButton button)
+        public WPFMessageBox(string message, string caption, MessageBoxButton button)
         {
             _titleString = caption;
             _messageString = message;
         }
 
-        public WDMessageBox(string message, string caption, MessageBoxImage image)
+        public WPFMessageBox(string message, string caption, MessageBoxImage image)
         {
             _titleString = caption;
             _messageString = message;
             DisplayImage(image);
         }
 
-        public WDMessageBox(string message, string caption, MessageBoxButton button, MessageBoxImage image)
+        public WPFMessageBox(string message, string caption, MessageBoxButton button, MessageBoxImage image)
         {
             _titleString = caption;
             _messageString = message;
@@ -125,19 +117,6 @@ public override void OnApplyTemplate()
                 _buttonOK.Click += ButtonOK_Click;
             }
 
-            _buttonYes = GetTemplateChild(ButtonYesTemplateName) as Button;
-            if (_buttonYes != null)
-            {
-                _buttonYes.Visibility = _yesVisibility;
-                _buttonYes.Click += ButtonYes_Click;
-            }
-
-            _buttonNo = GetTemplateChild(ButtonNoTemplateName) as Button;
-            if (_buttonNo != null)
-            {
-                _buttonNo.Visibility = _noVisibility;
-                _buttonNo.Click += ButtonNo_Click;
-            }
             if (Owner == null)
             {
                 BorderThickness = new Thickness(1);
@@ -164,18 +143,6 @@ public override void OnApplyTemplate()
 #endif
         }
 
-        private void ButtonNo_Click(object sender, RoutedEventArgs e)
-        {
-            Result = MessageBoxResult.No;
-            Close();
-        }
-
-        private void ButtonYes_Click(object sender, RoutedEventArgs e)
-        {
-            Result = MessageBoxResult.Yes;
-            Close();
-        }
-
         private void ButtonOK_Click(object sender, RoutedEventArgs e)
         {
             Result = MessageBoxResult.OK;
@@ -198,17 +165,9 @@ private void DisplayButtons(MessageBoxButton button)
             switch (button)
             {
                 case MessageBoxButton.OKCancel:
-                    _cancelVisibility = Visibility.Visible;
-                    _okVisibility = Visibility.Visible;
-                    break;
                 case MessageBoxButton.YesNo:
-                    _yesVisibility = Visibility.Visible;
-                    _noVisibility = Visibility.Visible;
-                    break;
-                case MessageBoxButton.YesNoCancel:
-                    _yesVisibility = Visibility.Visible;
-                    _noVisibility = Visibility.Visible;
                     _cancelVisibility = Visibility.Visible;
+                    _okVisibility = Visibility.Visible;
                     break;
                 default:
                     _okVisibility = Visibility.Visible;
diff --git a/src/WPFDevelopers.Samples.Shared/Controls/NavigateMenu/NavigateMenu.cs b/src/WPFDevelopers.Shared/Controls/NavigateMenu/NavigateMenu.cs
similarity index 67%
rename from src/WPFDevelopers.Samples.Shared/Controls/NavigateMenu/NavigateMenu.cs
rename to src/WPFDevelopers.Shared/Controls/NavigateMenu/NavigateMenu.cs
index a14ccaae..6f47dff9 100644
--- a/src/WPFDevelopers.Samples.Shared/Controls/NavigateMenu/NavigateMenu.cs
+++ b/src/WPFDevelopers.Shared/Controls/NavigateMenu/NavigateMenu.cs
@@ -5,7 +5,7 @@
 using System.Windows.Media.Animation;
 using System.Windows.Shapes;
 
-namespace WPFDevelopers.Samples.Controls
+namespace WPFDevelopers.Controls
 {
     [TemplatePart(Name = ListBoxTemplateName, Type = typeof(ListBox))]
     [TemplatePart(Name = RectangleTemplateName, Type = typeof(Rectangle))]
@@ -27,7 +27,6 @@ public class NavigateMenu : ListBox
         private ListBox _listBox;
         private Rectangle _rectangle;
         private TranslateTransform _translateTransform;
-        private double _lastY = 0d;
 
 
         static NavigateMenu()
@@ -38,14 +37,14 @@ static NavigateMenu()
 
         public Dock TabStripPlacement
         {
-            get => (Dock)GetValue(TabStripPlacementProperty);
+            get => (Dock) GetValue(TabStripPlacementProperty);
             set => SetValue(TabStripPlacementProperty, value);
         }
 
 
         public double RectangleSelectWidth
         {
-            get => (double)GetValue(RectangleSelectWidthProperty);
+            get => (double) GetValue(RectangleSelectWidthProperty);
             set => SetValue(RectangleSelectWidthProperty, value);
         }
 
@@ -53,7 +52,9 @@ public override void OnApplyTemplate()
         {
             base.OnApplyTemplate();
             if (ItemsSource == null)
-                return;
+            {
+            }
+
             _listBox = GetTemplateChild(ListBoxTemplateName) as ListBox;
             _rectangle = GetTemplateChild(RectangleTemplateName) as Rectangle;
             _translateTransform = GetTemplateChild(TranslateTransformTemplateName) as TranslateTransform;
@@ -74,11 +75,9 @@ protected override void OnSelectionChanged(SelectionChangedEventArgs e)
                     var offset = currentItem.TranslatePoint(new Point(0, 0), _rectangle).Y;
                     var animation = new DoubleAnimation
                     {
-                        From = _lastY,
                         To = offset,
                         Duration = TimeSpan.FromSeconds(0.3)
                     };
-                    _lastY = offset;
                     _translateTransform.BeginAnimation(TranslateTransform.YProperty, animation);
                     break;
                 case Dock.Top:
@@ -97,6 +96,43 @@ protected override void OnSelectionChanged(SelectionChangedEventArgs e)
                     base.OnSelectionChanged(e);
                     break;
             }
+
+            //if (_listBox == null) return;
+            //object viewItem = _listBox.ItemContainerGenerator.ContainerFromItem(SelectedItem);
+            //if (viewItem == null) return;
+            //var currentItem = viewItem as ListBoxItem;
+            //if (currentItem == null) return;
+            //RectangleSelectWidth = currentItem.ActualWidth;
+            //var offset = 0d;
+            //var animation = new DoubleAnimation()
+            //{
+            //    To = offset,
+            //    Duration = TimeSpan.FromSeconds(0.3),
+            //};
+            //switch (TabStripPlacement)
+            //{
+            //    case Dock.Left:
+            //    case Dock.Right:
+            //        offset = currentItem.TranslatePoint(new System.Windows.Point(0, 0), _rectangle).Y;
+            //        animation.To = offset;
+            //        _translateTransform.BeginAnimation(TranslateTransform.YProperty, animation);
+            //        break;
+            //    case Dock.Top:
+            //    case Dock.Bottom:
+            //        offset = currentItem.TranslatePoint(new System.Windows.Point(0, 0), _rectangle).X;
+            //        animation.To = offset;
+            //        _translateTransform.BeginAnimation(TranslateTransform.XProperty, animation);
+            //        break;
+            //}
+
+
+            //var offset = currentItem.TranslatePoint(new System.Windows.Point(0, 0), _rectangle).Y;
+            //var animation = new DoubleAnimation()
+            //{
+            //    To = offset,
+            //    Duration = TimeSpan.FromSeconds(0.3),
+            //};
+            //_translateTransform.BeginAnimation(TranslateTransform.YProperty, animation);
         }
     }
 }
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/Pagination/Pagination.cs b/src/WPFDevelopers.Shared/Controls/Pagination/Pagination.cs
index de9104a6..4bab85a8 100644
--- a/src/WPFDevelopers.Shared/Controls/Pagination/Pagination.cs
+++ b/src/WPFDevelopers.Shared/Controls/Pagination/Pagination.cs
@@ -272,10 +272,7 @@ private void UnsubscribeEvents()
                 _jumpPageNumericBox.ValueChanged -= OnJumpPageTextBoxChanged;
 
             if (_listBox != null)
-            {
-                _listBox.PreviewMouseMove -= ListBox_PreviewMouseMove;
                 _listBox.SelectionChanged -= OnSelectionChanged;
-            }
         }
 
         private void SubscribeEvents()
@@ -287,15 +284,7 @@ private void SubscribeEvents()
                 _jumpPageNumericBox.ValueChanged += OnJumpPageTextBoxChanged;
 
             if (_listBox != null)
-            {
-                _listBox.PreviewMouseMove += ListBox_PreviewMouseMove;
                 _listBox.SelectionChanged += OnSelectionChanged;
-            }
-        }
-
-        private void ListBox_PreviewMouseMove(object sender, MouseEventArgs e)
-        {
-            e.Handled = true;
         }
 
         private void UpdatePages()
diff --git a/src/WPFDevelopers.Shared/Controls/Charts/ChartRadar.cs b/src/WPFDevelopers.Shared/Controls/RadarChart/RadarChart.cs
similarity index 50%
rename from src/WPFDevelopers.Shared/Controls/Charts/ChartRadar.cs
rename to src/WPFDevelopers.Shared/Controls/RadarChart/RadarChart.cs
index 1ec8d4fd..c197dc4d 100644
--- a/src/WPFDevelopers.Shared/Controls/Charts/ChartRadar.cs
+++ b/src/WPFDevelopers.Shared/Controls/RadarChart/RadarChart.cs
@@ -1,118 +1,119 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Collections.ObjectModel;
 using System.Windows;
+using System.Windows.Controls;
 using System.Windows.Media;
 using WPFDevelopers.Helpers;
 
 namespace WPFDevelopers.Controls
 {
-    public class ChartRadar : ChartBase
+    public class RadarChart : Control
     {
-        private PointCollection _points;
-        private double _h, _w;
-        private Pen _penXAxis;
-        static ChartRadar()
+
+        public static readonly DependencyProperty RadarArrayProperty =
+            DependencyProperty.Register("RadarArray", typeof(ObservableCollection<RadarModel>), typeof(RadarChart),
+                new UIPropertyMetadata(OnRadarArrayChanged));
+
+        static RadarChart()
         {
-            DefaultStyleKeyProperty.OverrideMetadata(typeof(ChartRadar),
-                new FrameworkPropertyMetadata(typeof(ChartRadar)));
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(RadarChart),
+                new FrameworkPropertyMetadata(typeof(RadarChart)));
         }
-        protected override void OnRender(DrawingContext drawingContext)
+
+        public ObservableCollection<RadarModel> RadarArray
         {
-            base.OnRender(drawingContext);
-            _penXAxis = new Pen
-            {
-                Thickness = 1,
-                Brush = Application.Current.TryFindResource("WD.ChartXAxisSolidColorBrush") as Brush
-            };
-            _penXAxis.Freeze();
+            get => (ObservableCollection<RadarModel>)GetValue(RadarArrayProperty);
+            set => SetValue(RadarArrayProperty, value);
+        }
 
-            var dicts = new Dictionary<Rect, string>();
-            var rects = new List<Rect>();
-            var max = Convert.ToInt32(Datas.Max(kvp => kvp.Value)) + 50;
-            double v = StartX;
-            for (var i = 0; i < Rows; i++)
-            {
-                DrawPoints(v, drawingContext, i == Rows - 1);
-                v += StartX;
-            }
+        private static void OnRadarArrayChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        {
+            var radarChart = d as RadarChart;
+            if (e.NewValue != null)
+                radarChart.InvalidateVisual();
+        }
+
+        protected override void OnRender(DrawingContext drawingContext)
+        {
+            //防止延迟加载时，RadarArray为null时报错，防止RadarArray.Count==0时，后续做 被除数（double perangle = 360 / polygonBound） 时溢出错误
+            if (RadarArray == null || RadarArray.Count == 0)
+                return;
+            DrawPoints(150, drawingContext, true);
+            DrawPoints(100, drawingContext);
+            DrawPoints(50, drawingContext);
 
             var myPen = new Pen
             {
-                Thickness = 3,
-                Brush = NormalBrush
+                Thickness = 4,
+                Brush = ControlsHelper.PrimaryNormalBrush
             };
             myPen.Freeze();
-
             var streamGeometry = new StreamGeometry();
             using (var geometryContext = streamGeometry.Open())
             {
+                var h = ActualHeight / 2;
+                var w = ActualWidth / 2;
                 var points = new PointCollection();
-                short index = 0;
-                foreach (var item in Datas)
+                foreach (var item in RadarArray)
                 {
-                    if (index < _points.Count)
-                    {
-                        var startPoint = _points[index];
-                        var point = new Point((startPoint.X - _w) / max * item.Value + _w,
-                        (startPoint.Y - _h) / max * item.Value + _h);
-                        points.Add(point);
-                        var ellipsePoint = new Point(point.X - EllipseSize / 2, point.Y - EllipseSize / 2);
-                        var rect = new Rect(ellipsePoint, new Size(EllipseSize, EllipseSize));
-                        rects.Add(rect);
-                        var nRect = new Rect(rect.Left - EllipsePadding, rect.Top - EllipsePadding, rect.Width + EllipsePadding, rect.Height + EllipsePadding);
-                        dicts.Add(nRect, $"{item.Key} : {item.Value}");
-                    }
-                    index++;
+                    var model = new Point((item.PointValue.X - w) / 100 * item.ValueMax + w,
+                        (item.PointValue.Y - h) / 100 * item.ValueMax + h);
+                    points.Add(model);
                 }
+
                 geometryContext.BeginFigure(points[points.Count - 1], true, true);
                 geometryContext.PolyLineTo(points, true, true);
             }
-            PointCache = dicts;
+
             streamGeometry.Freeze();
             var color = (Color)Application.Current.TryFindResource("WD.PrimaryNormalColor");
             var rectBrush = new SolidColorBrush(color);
             rectBrush.Opacity = 0.5;
-            rectBrush.Freeze();
             drawingContext.DrawGeometry(rectBrush, myPen, streamGeometry);
-            DrawEllipse(rects, drawingContext);
         }
-        private void DrawPoints(double circleRadius, DrawingContext drawingContext, bool isDrawText = false)
+
+        private void DrawPoints(int circleRadius, DrawingContext drawingContext, bool isDrawText = false)
         {
-            var pieWidth = ActualWidth > ActualHeight ? ActualHeight : ActualWidth;
-            var pieHeight = ActualWidth > ActualHeight ? ActualHeight : ActualWidth;
-            _h = pieWidth / 2;
-            _w = pieHeight / 2;
+            var myPen = new Pen
+            {
+                Thickness = 2,
+                Brush = Brushes.Gainsboro
+            };
+            myPen.Freeze();
             var streamGeometry = new StreamGeometry();
             using (var geometryContext = streamGeometry.Open())
             {
+                var h = ActualHeight / 2;
+                var w = ActualWidth / 2;
+                PointCollection points = null;
                 if (isDrawText)
-                    _points = GetPolygonPoint(new Point(_w, _h), circleRadius, drawingContext);
+                    points = GetPolygonPoint(new Point(w, h), circleRadius, RadarArray.Count, drawingContext);
                 else
-                    _points = GetPolygonPoint(new Point(_w, _h), circleRadius);
-                geometryContext.BeginFigure(_points[_points.Count - 1], true, true);
-                geometryContext.PolyLineTo(_points, true, true);
+                    points = GetPolygonPoint(new Point(w, h), circleRadius, RadarArray.Count);
+                geometryContext.BeginFigure(points[points.Count - 1], true, true);
+                geometryContext.PolyLineTo(points, true, true);
             }
+
             streamGeometry.Freeze();
-            drawingContext.DrawGeometry(null, _penXAxis, streamGeometry);
+            drawingContext.DrawGeometry(null, myPen, streamGeometry);
         }
 
-        private PointCollection GetPolygonPoint(Point center, double r,
+        private PointCollection GetPolygonPoint(Point center, double r, int polygonBound,
             DrawingContext drawingContext = null)
         {
             double g = 18;
-            double perangle = 360 / Datas.Count();
+            double perangle = 360 / polygonBound;
             var pi = Math.PI;
             var values = new List<Point>();
-            foreach (var item in Datas)
+            for (var i = 0; i < polygonBound; i++)
             {
-                var p1 = new Point(_w, _h);
                 var p2 = new Point(r * Math.Cos(g * pi / 180) + center.X, r * Math.Sin(g * pi / 180) + center.Y);
                 if (drawingContext != null)
                 {
-                    drawingContext.DrawLine(_penXAxis, p1, p2);
-                    var formattedText = DrawingContextHelper.GetFormattedText(item.Key, ControlsHelper.PrimaryNormalBrush,
+                    var formattedText = DrawingContextHelper.GetFormattedText(RadarArray[i].Text, ControlsHelper.PrimaryNormalBrush,
                         flowDirection: FlowDirection.LeftToRight, textSize: 20.001D);
+                    RadarArray[i].PointValue = p2;
                     if (p2.Y > center.Y && p2.X < center.X)
                         drawingContext.DrawText(formattedText,
                             new Point(p2.X - formattedText.Width - 5, p2.Y - formattedText.Height / 2));
@@ -127,9 +128,11 @@ private PointCollection GetPolygonPoint(Point center, double r,
                     else
                         drawingContext.DrawText(formattedText, new Point(p2.X, p2.Y));
                 }
+
                 values.Add(p2);
                 g += perangle;
             }
+
             var pcollect = new PointCollection(values);
             return pcollect;
         }
diff --git a/src/WPFDevelopers.Shared/Controls/RadarChart/RadarModel.cs b/src/WPFDevelopers.Shared/Controls/RadarChart/RadarModel.cs
new file mode 100644
index 00000000..23e59835
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Controls/RadarChart/RadarModel.cs
@@ -0,0 +1,33 @@
+using System.Windows;
+using WPFDevelopers.Helpers;
+
+namespace WPFDevelopers.Controls
+{
+    public class RadarModel : ViewModelBase
+    {
+        private Point _pointValue;
+
+        private int _valueMax;
+        public string Text { get; set; }
+
+        public int ValueMax
+        {
+            get => _valueMax;
+            set
+            {
+                _valueMax = value;
+                NotifyPropertyChange("ValueMax");
+            }
+        }
+
+        public Point PointValue
+        {
+            get => _pointValue;
+            set
+            {
+                _pointValue = value;
+                NotifyPropertyChange("PointValue");
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs
index 543ff78e..cd3966aa 100644
--- a/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs
+++ b/src/WPFDevelopers.Shared/Controls/ScreenCut/ScreenCaptureExt.cs
@@ -9,7 +9,8 @@ namespace WPFDevelopers.Controls
 {
     public class ScreenCaptureExt : Window
     {
-        
+        const int WM_USER = 0x03FC;
+        const int MY_MESSAGE = WM_USER + 1;
         /// <summary>
         /// 截图完成委托
         /// </summary>
@@ -52,11 +53,11 @@ private IntPtr WndProc(IntPtr hwnd, int msg, IntPtr wParam, IntPtr lParam, ref b
         {
             switch (msg)
             {
-                case Helper.WM_USER:
+                case WM_USER:
                     GetClipboard();
                     Close();
                     break;
-                case Helper.MY_MESSAGE:
+                case MY_MESSAGE:
                     if (SnapCanceled != null) 
                         SnapCanceled();
                     Close();
diff --git a/src/WPFDevelopers.Shared/Core/Converts/CornerRadiusToSurroundConverter.cs b/src/WPFDevelopers.Shared/Core/Converts/CornerRadiusToSurroundConverter.cs
deleted file mode 100644
index aff165bc..00000000
--- a/src/WPFDevelopers.Shared/Core/Converts/CornerRadiusToSurroundConverter.cs
+++ /dev/null
@@ -1,63 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows;
-using System.Windows.Data;
-using WPFDevelopers.Controls;
-
-namespace WPFDevelopers.Converts
-{
-    public class CornerRadiusToSurroundConverter : IValueConverter
-    {
-        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (value is CornerRadius cornerRadius && parameter != null)
-            {
-                if (cornerRadius != new CornerRadius(0))
-                {
-                    CornerRadius _cornerRadius = cornerRadius;
-                    RadiusOrientation _radiusOrientation;
-                    if (Enum.TryParse(parameter.ToString(), out _radiusOrientation))
-                    {
-                        switch (_radiusOrientation)
-                        {
-                            case RadiusOrientation.Down:
-                                _cornerRadius.BottomRight = 0;
-                                _cornerRadius.BottomLeft = 0;
-                                break;
-                            case RadiusOrientation.Up:
-                                _cornerRadius.TopLeft = 0;
-                                _cornerRadius.TopRight = 0;
-                                break;
-                            case RadiusOrientation.Left:
-                                _cornerRadius.TopLeft = 0;
-                                _cornerRadius.BottomLeft = 0;
-                                break;
-                            case RadiusOrientation.Right:
-                                _cornerRadius.TopRight = 0;
-                                _cornerRadius.BottomRight = 0;
-                                break;
-                            case RadiusOrientation.TopLeft:
-                                _cornerRadius.TopRight = 0;
-                                _cornerRadius.BottomRight = 0;
-                                _cornerRadius.BottomLeft = 0;
-                                break;
-                            case RadiusOrientation.TopRight:
-                                _cornerRadius.TopLeft = 0;
-                                _cornerRadius.BottomRight = 0;
-                                _cornerRadius.BottomLeft = 0;
-                                break;
-                        }
-                    }
-                    return _cornerRadius;
-                }
-            }
-            return DependencyProperty.UnsetValue;
-        }
-
-        public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-
-}
diff --git a/src/WPFDevelopers.Shared/Core/Converts/WidthHeightToRectConverter.cs b/src/WPFDevelopers.Shared/Core/Converts/WidthHeightToRectConverter.cs
deleted file mode 100644
index cca9f677..00000000
--- a/src/WPFDevelopers.Shared/Core/Converts/WidthHeightToRectConverter.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.Globalization;
-using System.Windows.Data;
-
-namespace WPFDevelopers.Converts
-{
-    public class WidthHeightToRectConverter : IMultiValueConverter
-    {
-        public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
-        {
-            if (values.Length == 2 && values[0] is double width && values[1] is double height)
-                return new System.Windows.Rect(0, 0, width, height);
-            return Binding.DoNothing;
-        }
-
-        public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)
-        {
-            throw new NotImplementedException();
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
index 601604c4..524012af 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/ControlsHelper.cs
@@ -8,11 +8,9 @@
 using System.Windows.Controls;
 using System.Windows.Documents;
 using System.Windows.Interop;
-using System.Windows.Markup;
 using System.Windows.Media;
 using System.Windows.Media.Animation;
 using System.Windows.Media.Imaging;
-using System.Xml;
 
 namespace WPFDevelopers.Helpers
 {
@@ -217,24 +215,6 @@ public static T FindVisualChild<T>(DependencyObject parent) where T : Dependency
             return null;
         }
 
-        public static object GetXmlReader(object Content)
-        {
-            var originalContent = Content as UIElement;
-            string contentXaml = XamlWriter.Save(originalContent);
-            using (StringReader stringReader = new StringReader(contentXaml))
-            {
-                using (XmlReader xmlReader = XmlReader.Create(stringReader))
-                {
-                    object clonedContent = XamlReader.Load(xmlReader);
-
-                    if (clonedContent is UIElement clonedElement)
-                    {
-                        return clonedElement;
-                    }
-                }
-            }
-            return null;
-        }
 
     }
 
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
index d257ee26..78192910 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/ElementHelper.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Windows;
-using System.Windows.Controls;
+using System.Windows;
 
 namespace WPFDevelopers.Helpers
 {
@@ -22,10 +20,6 @@ public class ElementHelper : DependencyObject
            DependencyProperty.RegisterAttached("IsRound", typeof(bool), typeof(ElementHelper),
                new PropertyMetadata(false));
 
-        public static readonly DependencyProperty IsClearProperty =
-          DependencyProperty.RegisterAttached("IsClear", typeof(bool), typeof(ElementHelper),
-              new PropertyMetadata(false, OnIsClearChanged));
-
         public static CornerRadius GetCornerRadius(DependencyObject obj)
         {
             return (CornerRadius) obj.GetValue(CornerRadiusProperty);
@@ -64,41 +58,5 @@ public static void SetIsRound(DependencyObject obj, bool value)
         {
             obj.SetValue(IsRoundProperty, value);
         }
-        public static void SetIsClear(UIElement element, bool value)
-        {
-            element.SetValue(IsClearProperty, value);
-        }
-
-        public static bool GetIsClear(UIElement element)
-        {
-            return (bool)element.GetValue(IsClearProperty);
-        }
-
-        private static void OnIsClearChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            var button = d as Button;
-            if (button != null)
-            {
-                if ((bool)e.NewValue)
-                    button.Click += ButtonClear_Click;
-                else
-                    button.Click -= ButtonClear_Click;
-            }
-        }
-
-        private static void ButtonClear_Click(object sender, RoutedEventArgs e)
-        {
-            if (sender is Button button)
-            {
-                if (button.TemplatedParent is TextBox textBox)
-                {
-                    textBox.Clear();
-                }
-                else if (button.TemplatedParent is PasswordBox passwordBox)
-                {
-                    passwordBox.Clear();
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/GeometryHelper.cs b/src/WPFDevelopers.Shared/Core/Helpers/GeometryHelper.cs
deleted file mode 100644
index 3e60c28f..00000000
--- a/src/WPFDevelopers.Shared/Core/Helpers/GeometryHelper.cs
+++ /dev/null
@@ -1,156 +0,0 @@
-using System.Windows.Media;
-using System.Windows;
-using WPFDevelopers.Utilities;
-using System;
-
-namespace WPFDevelopers.Helpers
-{
-    public static class GeometryHelper
-    {
-        public static void GenerateGeometry(StreamGeometryContext ctx, Rect rect, Radii radii)
-        {
-            var point = new Point(radii.LeftTop, 0.0);
-            var point2 = new Point(rect.Width - radii.RightTop, 0.0);
-            var point3 = new Point(rect.Width, radii.TopRight);
-            var point4 = new Point(rect.Width, rect.Height - radii.BottomRight);
-            var point5 = new Point(rect.Width - radii.RightBottom, rect.Height);
-            var point6 = new Point(radii.LeftBottom, rect.Height);
-            var point7 = new Point(0.0, rect.Height - radii.BottomLeft);
-            var point8 = new Point(0.0, radii.TopLeft);
-            if (point.X > point2.X)
-            {
-                var x = radii.LeftTop / (radii.LeftTop + radii.RightTop) * rect.Width;
-                point.X = x;
-                point2.X = x;
-            }
-            if (point3.Y > point4.Y)
-            {
-                var y = radii.TopRight / (radii.TopRight + radii.BottomRight) * rect.Height;
-                point3.Y = y;
-                point4.Y = y;
-            }
-            if (point5.X < point6.X)
-            {
-                var x2 = radii.LeftBottom / (radii.LeftBottom + radii.RightBottom) * rect.Width;
-                point5.X = x2;
-                point6.X = x2;
-            }
-            if (point7.Y < point8.Y)
-            {
-                var y2 = radii.TopLeft / (radii.TopLeft + radii.BottomLeft) * rect.Height;
-                point7.Y = y2;
-                point8.Y = y2;
-            }
-            var vector = new Vector(rect.TopLeft.X, rect.TopLeft.Y);
-            point += vector;
-            point2 += vector;
-            point3 += vector;
-            point4 += vector;
-            point5 += vector;
-            point6 += vector;
-            point7 += vector;
-            point8 += vector;
-            ctx.BeginFigure(point, true, true);
-            ctx.LineTo(point2, true, false);
-            var width = rect.TopRight.X - point2.X;
-            var height = point3.Y - rect.TopRight.Y;
-            if (!DoubleUtil.IsZero(width) || !DoubleUtil.IsZero(height))
-            {
-                ctx.ArcTo(point3, new Size(width, height), 0.0, false, SweepDirection.Clockwise, true, false);
-            }
-            ctx.LineTo(point4, true, false);
-            width = rect.BottomRight.X - point5.X;
-            height = rect.BottomRight.Y - point4.Y;
-            if (!DoubleUtil.IsZero(width) || !DoubleUtil.IsZero(height))
-            {
-                ctx.ArcTo(point5, new Size(width, height), 0.0, false, SweepDirection.Clockwise, true, false);
-            }
-            ctx.LineTo(point6, true, false);
-            width = point6.X - rect.BottomLeft.X;
-            height = rect.BottomLeft.Y - point7.Y;
-            if (!DoubleUtil.IsZero(width) || !DoubleUtil.IsZero(height))
-            {
-                ctx.ArcTo(point7, new Size(width, height), 0.0, false, SweepDirection.Clockwise, true, false);
-            }
-            ctx.LineTo(point8, true, false);
-            width = point.X - rect.TopLeft.X;
-            height = point8.Y - rect.TopLeft.Y;
-            if (!DoubleUtil.IsZero(width) || !DoubleUtil.IsZero(height))
-            {
-                ctx.ArcTo(point, new Size(width, height), 0.0, false, SweepDirection.Clockwise, true, false);
-            }
-        }
-        public struct Radii
-        {
-            internal Radii(CornerRadius radii, Thickness borders, bool outer)
-            {
-                var left = 0.5 * borders.Left;
-                var top = 0.5 * borders.Top;
-                var right = 0.5 * borders.Right;
-                var bottom = 0.5 * borders.Bottom;
-                if (!outer)
-                {
-                    LeftTop = Math.Max(0.0, radii.TopLeft - left);
-                    TopLeft = Math.Max(0.0, radii.TopLeft - top);
-                    TopRight = Math.Max(0.0, radii.TopRight - top);
-                    RightTop = Math.Max(0.0, radii.TopRight - right);
-                    RightBottom = Math.Max(0.0, radii.BottomRight - right);
-                    BottomRight = Math.Max(0.0, radii.BottomRight - bottom);
-                    BottomLeft = Math.Max(0.0, radii.BottomLeft - bottom);
-                    LeftBottom = Math.Max(0.0, radii.BottomLeft - left);
-                    return;
-                }
-                if (DoubleUtil.IsZero(radii.TopLeft))
-                {
-                    LeftTop = (TopLeft = 0.0);
-                }
-                else
-                {
-                    LeftTop = radii.TopLeft + left;
-                    TopLeft = radii.TopLeft + top;
-                }
-                if (DoubleUtil.IsZero(radii.TopRight))
-                {
-                    TopRight = (RightTop = 0.0);
-                }
-                else
-                {
-                    TopRight = radii.TopRight + top;
-                    RightTop = radii.TopRight + right;
-                }
-                if (DoubleUtil.IsZero(radii.BottomRight))
-                {
-                    RightBottom = (BottomRight = 0.0);
-                }
-                else
-                {
-                    RightBottom = radii.BottomRight + right;
-                    BottomRight = radii.BottomRight + bottom;
-                }
-                if (DoubleUtil.IsZero(radii.BottomLeft))
-                {
-                    BottomLeft = (LeftBottom = 0.0);
-                    return;
-                }
-                BottomLeft = radii.BottomLeft + bottom;
-                LeftBottom = radii.BottomLeft + left;
-            }
-
-            internal double LeftTop;
-
-            internal double TopLeft;
-
-            internal double TopRight;
-
-            internal double RightTop;
-
-            internal double RightBottom;
-
-            internal double BottomRight;
-
-            internal double BottomLeft;
-
-            internal double LeftBottom;
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/Helper.cs b/src/WPFDevelopers.Shared/Core/Helpers/Helper.cs
index 9f14935a..94aaa148 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/Helper.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/Helper.cs
@@ -11,8 +11,11 @@ namespace WPFDevelopers
 {
     public class Helper
     {
-        public const int WM_USER = 0x03FC;
-        public const int MY_MESSAGE = WM_USER + 1;
+        //public static string GetTempPath = Path.Combine(Path.GetTempPath(), Assembly.GetEntryAssembly().GetName().Name);
+        //public static string GetTempPathVersion = Path.Combine(GetTempPath, Assembly.GetExecutingAssembly().GetName().Version.ToString());
+        //public const string GetExtName = "WPFDevelopersExt.exe";
+        //public static string GetTempPathVersionExt = Path.Combine(GetTempPathVersion, GetExtName);
+
         public static string GetTempPath = Path.Combine(Path.GetTempPath(), Assembly.GetExecutingAssembly().GetName().Name);
         public static string GetTempPathVersion = Path.Combine(GetTempPath, GetMD5Hash(GetCurrentDllPath()));
         public const string GetExtName = "WPFDevelopersExt.exe";
diff --git a/src/WPFDevelopers.Shared/Core/Helpers/Win32.cs b/src/WPFDevelopers.Shared/Core/Helpers/Win32.cs
index a2fa2d72..4c7030b7 100644
--- a/src/WPFDevelopers.Shared/Core/Helpers/Win32.cs
+++ b/src/WPFDevelopers.Shared/Core/Helpers/Win32.cs
@@ -17,8 +17,8 @@ public const string
             DwmApi = "dwmapi.dll",
             Winmm = "winmm.dll",
             Shcore = "Shcore.dll";
-        //查找窗口的委托 查找逻辑
-        public delegate bool EnumWindowsProc(IntPtr hwnd, IntPtr lParam);
+    //查找窗口的委托 查找逻辑
+    public delegate bool EnumWindowsProc(IntPtr hwnd, IntPtr lParam);
 
         [DllImport(User32)]
         public static extern IntPtr FindWindow(string className, string winName);
@@ -46,12 +46,6 @@ public static extern IntPtr FindWindowEx(IntPtr hwndParent, IntPtr hwndChildAfte
         [DllImport(User32)]
         public static extern bool SetForegroundWindow(IntPtr hWnd);
 
-        [DllImport(User32)]
-        public static extern bool PostMessage(IntPtr hWnd, uint Msg, IntPtr wParam, IntPtr lParam);
-
-        [DllImport(User32)]
-        public static extern int GetWindowText(IntPtr hWnd, StringBuilder lpString, int nMaxCount);
-
         [DllImport(Winmm)]
         public static extern long mciSendString(string strCommand, StringBuilder strReturn,
             int iReturnLength, IntPtr hwndCallback);
diff --git a/src/WPFDevelopers.Shared/LanguageManager.cs b/src/WPFDevelopers.Shared/LanguageManager.cs
deleted file mode 100644
index a14e863a..00000000
--- a/src/WPFDevelopers.Shared/LanguageManager.cs
+++ /dev/null
@@ -1,44 +0,0 @@
-using System;
-using System.ComponentModel;
-using System.Globalization;
-using System.Resources;
-using System.Threading;
-
-namespace WPFDevelopers
-{
-    public class LanguageManager : INotifyPropertyChanged
-    {
-        private readonly ResourceManager _resourceManager;
-        private static readonly Lazy<LanguageManager> _lazy = new Lazy<LanguageManager>(() => new LanguageManager());
-        public static LanguageManager Instance => _lazy.Value;
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        public LanguageManager()
-        {
-            _resourceManager = new ResourceManager("WPFDevelopers.Languages.Language", typeof(LanguageManager).Assembly);
-        }
-
-        public string this[string name]
-        {
-            get
-            {
-                if (name == null)
-                {
-                    throw new ArgumentNullException(nameof(name));
-                }
-                return _resourceManager.GetString(name);
-            }
-        }
-
-        public void ChangeLanguage(CultureInfo cultureInfo)
-        {
-            Thread.CurrentThread.CurrentCulture = cultureInfo;
-            Thread.CurrentThread.CurrentUICulture = cultureInfo;
-            OnPropertyChanged("Item[]");
-        }
-        protected virtual void OnPropertyChanged(string propertyName)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Shared/Languages/Language.Designer.cs b/src/WPFDevelopers.Shared/Languages/Language.Designer.cs
deleted file mode 100644
index c594edf2..00000000
--- a/src/WPFDevelopers.Shared/Languages/Language.Designer.cs
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-namespace WPFDevelopers.Languages 
-{
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class Language {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Language() {
-        }
-       
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WPFDevelopers.Languages.Language", typeof(Language).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 取消 的本地化字符串。
-        /// </summary>
-        public static string Cancel {
-            get {
-                return ResourceManager.GetString("Cancel", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 跳至 的本地化字符串。
-        /// </summary>
-        public static string Goto {
-            get {
-                return ResourceManager.GetString("Goto", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 条 的本地化字符串。
-        /// </summary>
-        public static string Items {
-            get {
-                return ResourceManager.GetString("Items", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 否 的本地化字符串。
-        /// </summary>
-        public static string No {
-            get {
-                return ResourceManager.GetString("No", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 确定 的本地化字符串。
-        /// </summary>
-        public static string OK {
-            get {
-                return ResourceManager.GetString("OK", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 页 的本地化字符串。
-        /// </summary>
-        public static string Page {
-            get {
-                return ResourceManager.GetString("Page", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 共 的本地化字符串。
-        /// </summary>
-        public static string Total {
-            get {
-                return ResourceManager.GetString("Total", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   查找类似 是 的本地化字符串。
-        /// </summary>
-        public static string Yes {
-            get {
-                return ResourceManager.GetString("Yes", resourceCulture);
-            }
-        }
-    }
-}
diff --git a/src/WPFDevelopers.Shared/Languages/Language.en-US.resx b/src/WPFDevelopers.Shared/Languages/Language.en-US.resx
deleted file mode 100644
index 4a9658df..00000000
--- a/src/WPFDevelopers.Shared/Languages/Language.en-US.resx
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="OK" xml:space="preserve">
-    <value>OK</value>
-  </data>
-  <data name="Cancel" xml:space="preserve">
-    <value>Cancel</value>
-  </data>
-  <data name="Yes" xml:space="preserve">
-    <value>Yes</value>
-  </data>
-  <data name="No" xml:space="preserve">
-    <value>No</value>
-  </data>
-  <data name="Goto" xml:space="preserve">
-    <value>Go to</value>
-  </data>
-  <data name="Page" xml:space="preserve">
-    <value>Page</value>
-  </data>
-  <data name="Items" xml:space="preserve">
-    <value>Items</value>
-  </data>
-  <data name="Total" xml:space="preserve">
-    <value>Total</value>
-  </data>
-  <data name="Rectangle" xml:space="preserve">
-    <value>Rectangle</value>
-  </data>
-  <data name="Ellipse" xml:space="preserve">
-    <value>Ellipse</value>
-  </data>
-  <data name="Arrow" xml:space="preserve">
-    <value>Arrow</value>
-  </data>
-  <data name="Ink" xml:space="preserve">
-    <value>Ink</value>
-  </data>
-  <data name="Text" xml:space="preserve">
-    <value>Text</value>
-  </data>
-  <data name="Save" xml:space="preserve">
-    <value>Save</value>
-  </data>
-  <data name="Complete" xml:space="preserve">
-    <value>Complete</value>
-  </data>
-  <data name="Close" xml:space="preserve">
-    <value>Close</value>
-  </data>
-  <data name="Select" xml:space="preserve">
-    <value>Select</value>
-  </data>
-  <data name="Replace" xml:space="preserve">
-    <value>Replace</value>
-  </data>
-  <data name="Clear" xml:space="preserve">
-    <value>Clear</value>
-  </data>
-  <data name="Minimize" xml:space="preserve">
-    <value>Minimize</value>
-  </data>
-  <data name="Maximize" xml:space="preserve">
-    <value>Maximize</value>
-  </data>
-  <data name="Restore" xml:space="preserve">
-    <value>Restore</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx b/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx
deleted file mode 100644
index 075244c7..00000000
--- a/src/WPFDevelopers.Shared/Languages/Language.ko-KR.resx
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="OK" xml:space="preserve">
-    <value>그래</value>
-  </data>
-  <data name="Cancel" xml:space="preserve">
-    <value>취소</value>
-  </data>
-  <data name="Yes" xml:space="preserve">
-    <value>예</value>
-  </data>
-  <data name="No" xml:space="preserve">
-    <value>아니오</value>
-  </data>
-  <data name="Goto" xml:space="preserve">
-    <value>이동</value>
-  </data>
-  <data name="Page" xml:space="preserve">
-    <value>페이지</value>
-  </data>
-  <data name="Items" xml:space="preserve">
-    <value>바</value>
-  </data>
-  <data name="Total" xml:space="preserve">
-    <value>전부의</value>
-  </data>
-  <data name="Rectangle" xml:space="preserve">
-    <value>직사각형</value>
-  </data>
-  <data name="Ellipse" xml:space="preserve">
-    <value>타원</value>
-  </data>
-  <data name="Arrow" xml:space="preserve">
-    <value>화살표</value>
-  </data>
-  <data name="Ink" xml:space="preserve">
-    <value>화필</value>
-  </data>
-  <data name="Text" xml:space="preserve">
-    <value>문자</value>
-  </data>
-  <data name="Save" xml:space="preserve">
-    <value>저장</value>
-  </data>
-  <data name="Complete" xml:space="preserve">
-    <value>완료</value>
-  </data>
-  <data name="Close" xml:space="preserve">
-    <value>닫기</value>
-  </data>
-  <data name="Select" xml:space="preserve">
-    <value>선택</value>
-  </data>
-  <data name="Replace" xml:space="preserve">
-    <value>교체</value>
-  </data>
-  <data name="Clear" xml:space="preserve">
-    <value>비우기</value>
-  </data>
-  <data name="Restore" xml:space="preserve">
-    <value>아래로 복원</value>
-  </data>
-  <data name="Minimize" xml:space="preserve">
-    <value>최소화</value>
-  </data>
-  <data name="Maximize" xml:space="preserve">
-    <value>최대화</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Languages/Language.resx b/src/WPFDevelopers.Shared/Languages/Language.resx
deleted file mode 100644
index 2c8474ab..00000000
--- a/src/WPFDevelopers.Shared/Languages/Language.resx
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-		Microsoft ResX Schema
-
-		Version 1.3
-
-		The primary goals of this format is to allow a simple XML format 
-		that is mostly human readable. The generation and parsing of the 
-		various data types are done through the TypeConverter classes 
-		associated with the data types.
-
-		Example:
-
-		... ado.net/XML headers & schema ...
-		<resheader name="resmimetype">text/microsoft-resx</resheader>
-		<resheader name="version">1.3</resheader>
-		<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-		<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-		<data name="Name1">this is my long string</data>
-		<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-		<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-			[base64 mime encoded serialized .NET Framework object]
-		</data>
-		<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-			[base64 mime encoded string representing a byte array form of the .NET Framework object]
-		</data>
-
-		There are any number of "resheader" rows that contain simple 
-		name/value pairs.
-
-		Each data row contains a name, and value. The row also contains a 
-		type or mimetype. Type corresponds to a .NET class that support 
-		text/value conversion through the TypeConverter architecture. 
-		Classes that don't support this are serialized and stored with the 
-		mimetype set.
-
-		The mimetype is used for serialized objects, and tells the 
-		ResXResourceReader how to depersist the object. This is currently not 
-		extensible. For a given mimetype the value must be set accordingly:
-
-		Note - application/x-microsoft.net.object.binary.base64 is the format 
-		that the ResXResourceWriter will generate, however the reader can 
-		read any of the formats listed below.
-
-		mimetype: application/x-microsoft.net.object.binary.base64
-		value   : The object must be serialized with 
-			: System.Serialization.Formatters.Binary.BinaryFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.soap.base64
-		value   : The object must be serialized with 
-			: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-			: and then encoded with base64 encoding.
-
-		mimetype: application/x-microsoft.net.object.bytearray.base64
-		value   : The object must be serialized into a byte array 
-			: using a System.ComponentModel.TypeConverter
-			: and then encoded with base64 encoding.
-	-->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>1.3</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="OK" xml:space="preserve">
-    <value>确定</value>
-  </data>
-  <data name="Cancel" xml:space="preserve">
-    <value>取消</value>
-  </data>
-  <data name="Yes" xml:space="preserve">
-    <value>是</value>
-  </data>
-  <data name="No" xml:space="preserve">
-    <value>否</value>
-  </data>
-  <data name="Goto" xml:space="preserve">
-    <value>跳至</value>
-  </data>
-  <data name="Page" xml:space="preserve">
-    <value>页</value>
-  </data>
-  <data name="Items" xml:space="preserve">
-    <value>条</value>
-  </data>
-  <data name="Total" xml:space="preserve">
-    <value>共</value>
-  </data>
-  <data name="Rectangle" xml:space="preserve">
-    <value>方框</value>
-  </data>
-  <data name="Ellipse" xml:space="preserve">
-    <value>椭圆</value>
-  </data>
-  <data name="Arrow" xml:space="preserve">
-    <value>箭头</value>
-  </data>
-  <data name="Ink" xml:space="preserve">
-    <value>画笔</value>
-  </data>
-  <data name="Text" xml:space="preserve">
-    <value>文字</value>
-  </data>
-  <data name="Save" xml:space="preserve">
-    <value>保存</value>
-  </data>
-  <data name="Complete" xml:space="preserve">
-    <value>完成</value>
-  </data>
-  <data name="Close" xml:space="preserve">
-    <value>关闭</value>
-  </data>
-  <data name="Select" xml:space="preserve">
-    <value>选择</value>
-  </data>
-  <data name="Replace" xml:space="preserve">
-    <value>更换</value>
-  </data>
-  <data name="Clear" xml:space="preserve">
-    <value>清空</value>
-  </data>
-  <data name="Minimize" xml:space="preserve">
-    <value>最小化</value>
-  </data>
-  <data name="Maximize" xml:space="preserve">
-    <value>最大化</value>
-  </data>
-  <data name="Restore" xml:space="preserve">
-    <value>向下还原</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml b/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml
index fe78678d..04e107c6 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.DataGrid.xaml
@@ -3,7 +3,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:WPFDevelopers.Controls"
     xmlns:converts="clr-namespace:WPFDevelopers.Converts"
-    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Themes/Basic/ControlBasic.xaml" />
@@ -39,6 +38,14 @@
                                 <SolidColorBrush Color="{DynamicResource WD.PrimaryTextColor}" />
                             </Polygon.Fill>
                         </Polygon>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="MouseOver" />
+                                <VisualState x:Name="Pressed" />
+                                <VisualState x:Name="Disabled" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
                     </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsMouseOver" Value="True">
@@ -55,7 +62,7 @@
         BasedOn="{StaticResource WD.ControlBasicStyle}"
         TargetType="{x:Type DataGrid}">
         <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderThickness" Value="1,1,1,0" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
         <Setter Property="Background" Value="{x:Null}" />
         <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
@@ -68,32 +75,22 @@
         <Setter Property="AutoGenerateColumns" Value="False" />
         <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
         <Setter Property="RowHeaderWidth" Value="0" />
-        <Setter Property="RowDetailsVisibilityMode" Value="VisibleWhenSelected" />
-        <Setter Property="ScrollViewer.CanContentScroll" Value="true" />
-        <Setter Property="ScrollViewer.PanningMode" Value="VerticalOnly" />
-        <Setter Property="Stylus.IsFlicksEnabled" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGrid}">
-                    <controls:WDBorder
+                    <Border
                         x:Name="DGR_Border"
-                        Padding="0,0,0,.1"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                         SnapsToDevicePixels="True">
-                        <ScrollViewer
-                            x:Name="DG_ScrollViewer"
-                            Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}"
-                            Focusable="False">
+                        <ScrollViewer x:Name="DG_ScrollViewer" Focusable="False">
                             <ScrollViewer.Template>
                                 <ControlTemplate TargetType="{x:Type ScrollViewer}">
                                     <Grid>
                                         <Grid.ColumnDefinitions>
                                             <ColumnDefinition Width="Auto" />
                                             <ColumnDefinition Width="*" />
-                                            <ColumnDefinition Width="Auto" />
                                         </Grid.ColumnDefinitions>
                                         <Grid.RowDefinitions>
                                             <RowDefinition Height="Auto" />
@@ -101,7 +98,6 @@
                                             <RowDefinition Height="Auto" />
                                         </Grid.RowDefinitions>
                                         <Button
-                                            x:Name="PART_DataGridSelectAllButton"
                                             Width="{Binding CellsPanelHorizontalOffset, RelativeSource={RelativeSource AncestorType=DataGrid}, Converter={StaticResource WD.DoubleMinConverter}}"
                                             Command="{x:Static DataGrid.SelectAllCommand}"
                                             Focusable="False"
@@ -145,7 +141,13 @@
                             </ScrollViewer.Template>
                             <ItemsPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                         </ScrollViewer>
-                    </controls:WDBorder>
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Disabled" />
+                                <VisualState x:Name="Normal" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
+                    </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -318,12 +320,7 @@
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type DataGridRowHeader}">
                     <controls:SmallPanel HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}">
-                        <Border
-                            x:Name="DGR_Border"
-                            Background="{TemplateBinding Background}"
-                            BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            SnapsToDevicePixels="True">
+                        <Border x:Name="rowHeaderBorder" Background="{TemplateBinding Background}">
                             <StackPanel Orientation="Horizontal">
                                 <ContentPresenter
                                     HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
@@ -344,6 +341,26 @@
                             x:Name="PART_BottomHeaderGripper"
                             VerticalAlignment="Bottom"
                             Style="{StaticResource WD.RowHeaderGripperStyle}" />
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Normal_CurrentRow" />
+                                <VisualState x:Name="Unfocused_EditingRow" />
+                                <VisualState x:Name="Normal_EditingRow" />
+                                <VisualState x:Name="MouseOver" />
+                                <VisualState x:Name="MouseOver_CurrentRow" />
+                                <VisualState x:Name="MouseOver_Unfocused_EditingRow" />
+                                <VisualState x:Name="MouseOver_EditingRow" />
+                                <VisualState x:Name="MouseOver_Unfocused_Selected" />
+                                <VisualState x:Name="MouseOver_Selected" />
+                                <VisualState x:Name="MouseOver_Unfocused_CurrentRow_Selected" />
+                                <VisualState x:Name="MouseOver_CurrentRow_Selected" />
+                                <VisualState x:Name="Unfocused_Selected" />
+                                <VisualState x:Name="Unfocused_CurrentRow_Selected" />
+                                <VisualState x:Name="Normal_CurrentRow_Selected" />
+                                <VisualState x:Name="Normal_Selected" />
+                            </VisualStateGroup>
+                        </VisualStateManager.VisualStateGroups>
                     </controls:SmallPanel>
                 </ControlTemplate>
             </Setter.Value>
@@ -406,12 +423,11 @@
                     </ControlTemplate.Resources>
                     <controls:SmallPanel>
                         <Border
-                            x:Name="DGR_Border"
+                            x:Name="columnHeaderBorder"
                             Padding="{TemplateBinding Padding}"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            SnapsToDevicePixels="True">
+                            BorderThickness="{TemplateBinding BorderThickness}">
                             <Grid Name="HedearGrid">
                                 <Grid.ColumnDefinitions>
                                     <ColumnDefinition Width="*" />
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml b/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml
index d10a6ad1..d6dba6cc 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.DatePicker.xaml
@@ -445,7 +445,7 @@
                             Background="{DynamicResource WD.BackgroundSolidColorBrush}"
                             BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
                             BorderThickness="1"
-                            CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType=Calendar}}"
+                            CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                             SnapsToDevicePixels="True"
                             UseLayoutRounding="True">
                             <Border.Effect>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.Expander.xaml b/src/WPFDevelopers.Shared/Styles/Styles.Expander.xaml
index bd248956..acc3832c 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.Expander.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.Expander.xaml
@@ -16,43 +16,31 @@
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="VerticalContentAlignment" Value="Stretch" />
-        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
+        <Setter Property="BorderBrush" Value="{DynamicResource WD.LighterSolidColorBrush}" />
         <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type Expander}">
-                    <Border
-                        x:Name="PART_BorderRoot"
-                        Margin="{TemplateBinding Margin}"
-                        Background="{TemplateBinding Background}"
-                        BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="0"
-                        ClipToBounds="True"
-                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                        SnapsToDevicePixels="True">
+                    <Border Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
                         <DockPanel>
                             <ToggleButton
                                 x:Name="HeaderSite"
                                 HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
                                 VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
-                                BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="1"
                                 Content="{TemplateBinding Header}"
                                 ContentTemplate="{TemplateBinding HeaderTemplate}"
                                 DockPanel.Dock="Top"
                                 IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
                                 <ToggleButton.Style>
                                     <Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-                                        <Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type Expander}}}" />
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate TargetType="{x:Type ToggleButton}">
                                                     <Border
                                                         x:Name="PART_Border"
                                                         Background="{DynamicResource WD.LighterSolidColorBrush}"
-                                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                                        BorderThickness="{TemplateBinding BorderThickness}"
-                                                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+                                                        BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
+                                                        BorderThickness="1">
                                                         <Grid
                                                             Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}"
                                                             Background="Transparent"
@@ -109,11 +97,6 @@
                                                             </VisualStateGroup>
                                                         </VisualStateManager.VisualStateGroups>
                                                     </Border>
-                                                    <ControlTemplate.Triggers>
-                                                        <Trigger Property="IsChecked" Value="True">
-                                                            <Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}" />
-                                                        </Trigger>
-                                                    </ControlTemplate.Triggers>
                                                 </ControlTemplate>
                                             </Setter.Value>
                                         </Setter>
@@ -122,6 +105,8 @@
                             </ToggleButton>
                             <Border
                                 x:Name="PART_Content"
+                                BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
+                                BorderThickness="0"
                                 DockPanel.Dock="Bottom"
                                 RenderTransformOrigin=".5,0"
                                 SnapsToDevicePixels="True"
@@ -145,8 +130,6 @@
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsExpanded" Value="True">
                             <Setter TargetName="PART_Content" Property="Visibility" Value="Visible" />
-                            <Setter TargetName="PART_BorderRoot" Property="BorderThickness" Value="1" />
-                            <Setter TargetName="HeaderSite" Property="BorderThickness" Value="0" />
                         </Trigger>
                         <Trigger Property="ExpandDirection" Value="Right">
                             <Setter TargetName="ExpandSite" Property="DockPanel.Dock" Value="Right" />
@@ -160,16 +143,14 @@
                             <Setter TargetName="HeaderSite" Property="Style">
                                 <Setter.Value>
                                     <Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-                                        <Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type Expander}}}" />
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate TargetType="{x:Type ToggleButton}">
                                                     <Border
                                                         x:Name="PART_Border"
                                                         Background="{DynamicResource WD.LighterSolidColorBrush}"
-                                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                                        BorderThickness="{TemplateBinding BorderThickness}"
-                                                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+                                                        BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
+                                                        BorderThickness="1">
                                                         <Grid
                                                             Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}"
                                                             Background="Transparent"
@@ -233,11 +214,6 @@
                                                             </VisualStateGroup>
                                                         </VisualStateManager.VisualStateGroups>
                                                     </Border>
-                                                    <ControlTemplate.Triggers>
-                                                        <Trigger Property="IsChecked" Value="True">
-                                                            <Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding (helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Right}" />
-                                                        </Trigger>
-                                                    </ControlTemplate.Triggers>
                                                 </ControlTemplate>
                                             </Setter.Value>
                                         </Setter>
@@ -252,16 +228,14 @@
                             <Setter TargetName="HeaderSite" Property="Style">
                                 <Setter.Value>
                                     <Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-                                        <Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type Expander}}}" />
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate TargetType="{x:Type ToggleButton}">
                                                     <Border
                                                         x:Name="PART_Border"
                                                         Background="{DynamicResource WD.LighterSolidColorBrush}"
-                                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                                        BorderThickness="{TemplateBinding BorderThickness}"
-                                                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+                                                        BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
+                                                        BorderThickness="1">
                                                         <Grid
                                                             Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}"
                                                             Background="Transparent"
@@ -320,11 +294,6 @@
                                                             </VisualStateGroup>
                                                         </VisualStateManager.VisualStateGroups>
                                                     </Border>
-                                                    <ControlTemplate.Triggers>
-                                                        <Trigger Property="IsChecked" Value="True">
-                                                            <Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Up}" />
-                                                        </Trigger>
-                                                    </ControlTemplate.Triggers>
                                                 </ControlTemplate>
                                             </Setter.Value>
                                         </Setter>
@@ -344,16 +313,14 @@
                             <Setter TargetName="HeaderSite" Property="Style">
                                 <Setter.Value>
                                     <Style BasedOn="{StaticResource WD.ControlBasicStyle}" TargetType="{x:Type ToggleButton}">
-                                        <Setter Property="helpers:ElementHelper.CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource AncestorType={x:Type Expander}}}" />
                                         <Setter Property="Template">
                                             <Setter.Value>
                                                 <ControlTemplate TargetType="{x:Type ToggleButton}">
                                                     <Border
                                                         x:Name="PART_Border"
                                                         Background="{DynamicResource WD.LighterSolidColorBrush}"
-                                                        BorderBrush="{TemplateBinding BorderBrush}"
-                                                        BorderThickness="{TemplateBinding BorderThickness}"
-                                                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+                                                        BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
+                                                        BorderThickness="1">
                                                         <Grid
                                                             Margin="{Binding Padding, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Expander}}}"
                                                             Background="Transparent"
@@ -417,11 +384,6 @@
                                                             </VisualStateGroup>
                                                         </VisualStateManager.VisualStateGroups>
                                                     </Border>
-                                                    <ControlTemplate.Triggers>
-                                                        <Trigger Property="IsChecked" Value="True">
-                                                            <Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Left}" />
-                                                        </Trigger>
-                                                    </ControlTemplate.Triggers>
                                                 </ControlTemplate>
                                             </Setter.Value>
                                         </Setter>
@@ -435,7 +397,6 @@
                                 <Condition Property="ExpandDirection" Value="Down" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_Content" Property="BorderThickness" Value="1,0,1,1" />
-                            <Setter TargetName="HeaderSite" Property="BorderThickness" Value="0,0,0,1" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard x:Name="PART_DownBeginStoryboard">
                                     <Storyboard>
@@ -457,7 +418,6 @@
                                 <Condition Property="ExpandDirection" Value="Right" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_Content" Property="BorderThickness" Value="0,1,1,1" />
-                            <Setter TargetName="HeaderSite" Property="BorderThickness" Value="0,0,1,0" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard x:Name="PART_RightBeginStoryboard">
                                     <Storyboard>
@@ -479,7 +439,6 @@
                                 <Condition Property="ExpandDirection" Value="Up" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_Content" Property="BorderThickness" Value="1,1,1,0" />
-                            <Setter TargetName="HeaderSite" Property="BorderThickness" Value="0,1,0,0" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard x:Name="PART_UpBeginStoryboard">
                                     <Storyboard>
@@ -501,7 +460,6 @@
                                 <Condition Property="ExpandDirection" Value="Left" />
                             </MultiTrigger.Conditions>
                             <Setter TargetName="PART_Content" Property="BorderThickness" Value="1,1,0,1" />
-                            <Setter TargetName="HeaderSite" Property="BorderThickness" Value="1,0,0,0" />
                             <MultiTrigger.EnterActions>
                                 <BeginStoryboard x:Name="PART_LeftBeginStoryboard">
                                     <Storyboard>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml
index 00b3390d..49ea28d7 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.GroupBox.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Themes/Basic/ControlBasic.xaml" />
@@ -14,21 +13,19 @@
         <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
         <Setter Property="Background" Value="{DynamicResource WD.LighterSolidColorBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type GroupBox}">
-                    <Grid Margin="{TemplateBinding Margin}">
+                    <Grid>
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="*" />
                         </Grid.RowDefinitions>
                         <Border
+                            Grid.Row="0"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}"
-                            SnapsToDevicePixels="True">
+                            BorderThickness="1">
                             <ContentPresenter
                                 Margin="{TemplateBinding Padding}"
                                 VerticalAlignment="Center"
@@ -39,7 +36,6 @@
                             Grid.Row="1"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="1,0,1,1"
-                            CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Up}"
                             SnapsToDevicePixels="True">
                             <ContentPresenter Margin="{TemplateBinding Padding}" />
                         </Border>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.ListBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.ListBox.xaml
index b67c43cf..26e052b3 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.ListBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.ListBox.xaml
@@ -2,7 +2,6 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
@@ -17,24 +16,20 @@
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.CanContentScroll" Value="True" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
+        <Setter Property="BorderThickness" Value="0,1,0,0" />
         <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ListBox}">
-                    <controls:WDBorder
-                        x:Name="Border"
-                        Margin="{TemplateBinding Margin}"
-                        Padding="0,0,0,.1"
+                    <Border
+                        Name="Border"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                        SnapsToDevicePixels="True">
-                        <ScrollViewer Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" Focusable="False">
+                        BorderThickness="{TemplateBinding BorderThickness}">
+                        <ScrollViewer Focusable="False">
                             <VirtualizingStackPanel IsItemsHost="True" />
                         </ScrollViewer>
-                    </controls:WDBorder>
+                    </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="IsGrouping" Value="True">
                             <Setter Property="ScrollViewer.CanContentScroll" Value="False" />
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.ListView.xaml b/src/WPFDevelopers.Shared/Styles/Styles.ListView.xaml
index 4051d220..59d6e46c 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.ListView.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.ListView.xaml
@@ -2,7 +2,6 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
@@ -17,7 +16,12 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type ScrollViewer}">
-                    <controls:SmallPanel>
+                    <Grid Background="{TemplateBinding Background}">
+                        <Grid.RowDefinitions>
+                            <RowDefinition Height="*" />
+                            <RowDefinition Height="Auto" />
+                        </Grid.RowDefinitions>
+
                         <DockPanel Margin="{TemplateBinding Padding}">
                             <ScrollViewer
                                 DockPanel.Dock="Top"
@@ -34,6 +38,7 @@
                                     Columns="{Binding Path=TemplatedParent.View.Columns, RelativeSource={RelativeSource TemplatedParent}}"
                                     SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
                             </ScrollViewer>
+
                             <ScrollContentPresenter
                                 Name="PART_ScrollContentPresenter"
                                 CanContentScroll="True"
@@ -41,9 +46,10 @@
                                 CanVerticallyScroll="False"
                                 KeyboardNavigation.DirectionalNavigation="Local" />
                         </DockPanel>
+
                         <ScrollBar
                             Name="PART_HorizontalScrollBar"
-                            VerticalAlignment="Bottom"
+                            Grid.Row="1"
                             Maximum="{TemplateBinding ScrollableWidth}"
                             Orientation="Horizontal"
                             ViewportSize="{TemplateBinding ViewportWidth}"
@@ -56,7 +62,8 @@
                             ViewportSize="{TemplateBinding ViewportHeight}"
                             Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
                             Value="{TemplateBinding VerticalOffset}" />
-                    </controls:SmallPanel>
+
+                    </Grid>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -155,26 +162,8 @@
                         Name="Border"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                        SnapsToDevicePixels="True">
+                        BorderThickness="{TemplateBinding BorderThickness}">
                         <ScrollViewer Style="{StaticResource WD.GridViewScrollViewerStyleKey}">
-                            <ScrollViewer.Clip>
-                                <RectangleGeometry>
-                                    <RectangleGeometry.RadiusX>
-                                        <Binding ElementName="Border" Path="CornerRadius.TopLeft" />
-                                    </RectangleGeometry.RadiusX>
-                                    <RectangleGeometry.RadiusY>
-                                        <Binding ElementName="Border" Path="CornerRadius.TopLeft" />
-                                    </RectangleGeometry.RadiusY>
-                                    <RectangleGeometry.Rect>
-                                        <MultiBinding Converter="{StaticResource WD.WidthHeightToRectConverter}">
-                                            <Binding Path="ActualWidth" RelativeSource="{RelativeSource AncestorType=ScrollViewer}" />
-                                            <Binding Path="ActualHeight" RelativeSource="{RelativeSource AncestorType=ScrollViewer}" />
-                                        </MultiBinding>
-                                    </RectangleGeometry.Rect>
-                                </RectangleGeometry>
-                            </ScrollViewer.Clip>
                             <ItemsPresenter />
                         </ScrollViewer>
                     </Border>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.Menu.xaml b/src/WPFDevelopers.Shared/Styles/Styles.Menu.xaml
index c46fba45..cc127e55 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.Menu.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.Menu.xaml
@@ -78,8 +78,9 @@
                             CornerRadius="0,0,3,3"
                             Effect="{StaticResource WD.PopupShadowDepth}"
                             SnapsToDevicePixels="True">
+
                             <ScrollViewer Margin="0,4" CanContentScroll="True">
-                                <VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+                                <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
                             </ScrollViewer>
                         </Border>
                         <Border
@@ -259,11 +260,11 @@
                         Background="{DynamicResource WD.BackgroundSolidColorBrush}"
                         BorderBrush="{DynamicResource WD.BaseSolidColorBrush}"
                         BorderThickness="1"
-                        CornerRadius="0,0,3,3"
+                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
                         Effect="{StaticResource WD.PopupShadowDepth}"
                         SnapsToDevicePixels="True">
                         <ScrollViewer Margin="0,4" CanContentScroll="True">
-                            <VirtualizingStackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
+                            <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Cycle" />
                         </ScrollViewer>
                     </Border>
                 </Popup>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml
index 7ffeee25..110c217b 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.MessageBox.xaml
@@ -2,13 +2,13 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:resx="clr-namespace:WPFDevelopers">
+    xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Themes/Basic/ControlBasic.xaml" />
         <ResourceDictionary Source="../Themes/Basic/Animations.xaml" />
     </ResourceDictionary.MergedDictionaries>
-    <Style x:Key="WD.WDMessageBox" TargetType="{x:Type controls:WDMessageBox}">
+    <Style x:Key="WD.WPFMessageBox" TargetType="{x:Type controls:WPFMessageBox}">
         <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
         <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
@@ -23,7 +23,7 @@
         <Setter Property="FontFamily" Value="{StaticResource WD.NormalFontFamily}" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:WDMessageBox}">
+                <ControlTemplate TargetType="{x:Type controls:WPFMessageBox}">
                     <Border
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
@@ -47,8 +47,7 @@
                                         Margin="0,6"
                                         HorizontalAlignment="Right"
                                         IsTabStop="False"
-                                        Style="{DynamicResource WD.WindowButtonStyle}"
-                                        ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
+                                        Style="{DynamicResource WD.WindowButtonStyle}">
                                         <Path
                                             Width="10"
                                             Height="10"
@@ -82,35 +81,19 @@
                                         TextWrapping="Wrap" />
                                 </DockPanel>
                             </controls:SmallPanel>
-                            <controls:SmallPanel
-                                Grid.Row="2"
-                                Margin="140,20,10,10"
-                                HorizontalAlignment="Right">
+                            <controls:SmallPanel Grid.Row="2" Margin="140,20,10,10">
                                 <UniformGrid Height="38" Rows="1">
                                     <Button
-                                        x:Name="PART_ButtonYes"
-                                        Width="60"
-                                        Content="{Binding [Yes], Source={x:Static resx:LanguageManager.Instance}}"
-                                        Style="{DynamicResource WD.PrimaryButton}"
-                                        Visibility="Collapsed" />
-                                    <Button
-                                        x:Name="PART_ButtonNo"
+                                        x:Name="PART_ButtonCancel"
                                         Width="60"
-                                        Margin="6,0,0,0"
-                                        Content="{Binding [No], Source={x:Static resx:LanguageManager.Instance}}"
+                                        Content="取消"
                                         Visibility="Collapsed" />
                                     <Button
                                         x:Name="PART_ButtonOK"
                                         Width="60"
                                         Margin="6,0,0,0"
-                                        Content="{Binding [OK], Source={x:Static resx:LanguageManager.Instance}}"
+                                        Content="确认"
                                         Style="{DynamicResource WD.PrimaryButton}" />
-                                    <Button
-                                        x:Name="PART_ButtonCancel"
-                                        Width="60"
-                                        Margin="6,0,0,0"
-                                        Content="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}"
-                                        Visibility="Collapsed" />
                                 </UniformGrid>
                             </controls:SmallPanel>
                         </Grid>
@@ -119,5 +102,5 @@
             </Setter.Value>
         </Setter>
     </Style>
-    <Style BasedOn="{StaticResource WD.WDMessageBox}" TargetType="{x:Type controls:WDMessageBox}" />
+    <Style BasedOn="{StaticResource WD.WPFMessageBox}" TargetType="{x:Type controls:WPFMessageBox}" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.PasswordBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.PasswordBox.xaml
index 01758842..ecacf83e 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.PasswordBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.PasswordBox.xaml
@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:WPFDevelopers.Controls"
     xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
-    xmlns:resx="clr-namespace:WPFDevelopers">
+    xmlns:sys="clr-namespace:System;assembly=mscorlib">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Themes/Basic/ControlBasic.xaml" />
@@ -49,23 +49,6 @@
                                 TextTrimming="CharacterEllipsis"
                                 Visibility="Collapsed" />
                             <ScrollViewer x:Name="PART_ContentHost" />
-                            <Button
-                                x:Name="PART_CloseButton"
-                                Width="20"
-                                Height="20"
-                                Margin="0,0,4,0"
-                                HorizontalAlignment="Right"
-                                helpers:ElementHelper.IsClear="{Binding Path=(helpers:ElementHelper.IsClear), RelativeSource={RelativeSource TemplatedParent}}"
-                                helpers:ElementHelper.IsRound="True"
-                                Style="{StaticResource WD.NormalButton}"
-                                ToolTip="{Binding [Clear], Source={x:Static resx:LanguageManager.Instance}}"
-                                Visibility="Collapsed">
-                                <controls:PathIcon
-                                    Width="10"
-                                    Height="10"
-                                    Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}"
-                                    Kind="WindowClose" />
-                            </Button>
                         </controls:SmallPanel>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -75,16 +58,6 @@
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
                         </Trigger>
-                        <Trigger Property="helpers:ElementHelper.IsClear" Value="True">
-                            <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="helpers:ElementHelper.IsClear" Value="True" />
-                                <Condition Property="helpers:PasswordBoxHelper.PasswordLength" Value="0" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Collapsed" />
-                        </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.ProgressBar.xaml b/src/WPFDevelopers.Shared/Styles/Styles.ProgressBar.xaml
index 9dbb3925..27432e2f 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.ProgressBar.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.ProgressBar.xaml
@@ -37,18 +37,18 @@
                             </PointAnimationUsingKeyFrames>
                         </Storyboard>
                     </ControlTemplate.Resources>
-                    <controls:WDBorder x:Name="PART_TemplateRoot" CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
+                    <Border x:Name="PART_TemplateRoot">
                         <controls:SmallPanel ClipToBounds="True" SnapsToDevicePixels="True">
                             <Border
                                 x:Name="PART_Border"
                                 Background="{DynamicResource WD.BaseSolidColorBrush}"
-                                Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
+                                CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
                             <Rectangle x:Name="PART_Track" />
                             <Decorator x:Name="PART_Indicator" HorizontalAlignment="Left">
                                 <Border
                                     x:Name="Indicator"
                                     Background="{TemplateBinding Foreground}"
-                                    Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}" />
+                                    CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}" />
                             </Decorator>
                             <Rectangle
                                 x:Name="PART_Rectangle"
@@ -59,7 +59,7 @@
                                 </Rectangle.RenderTransform>
                             </Rectangle>
                         </controls:SmallPanel>
-                    </controls:WDBorder>
+                    </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="Orientation" Value="Vertical">
                             <Setter Property="Height" Value="{x:Static sys:Double.NaN}" />
@@ -75,6 +75,7 @@
                             </Trigger.EnterActions>
                             <Setter TargetName="PART_Indicator" Property="Visibility" Value="Collapsed" />
                             <Setter TargetName="PART_Rectangle" Property="Visibility" Value="Visible" />
+                            <Setter TargetName="PART_Border" Property="CornerRadius" Value="0" />
                             <Trigger.ExitActions>
                                 <StopStoryboard BeginStoryboardName="IndeterminateStoryboard" />
                             </Trigger.ExitActions>
@@ -127,6 +128,7 @@
                                 <StopStoryboard BeginStoryboardName="LoadedBeginStoryboard" />
                             </Trigger.ExitActions>
                         </Trigger>
+
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.Slider.xaml b/src/WPFDevelopers.Shared/Styles/Styles.Slider.xaml
index d212016f..43187fbe 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.Slider.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.Slider.xaml
@@ -73,32 +73,17 @@
     <Style
         x:Key="WD.SliderRepeatButtonStyle"
         BasedOn="{StaticResource WD.ControlBasicStyle}"
-        TargetType="{x:Type controls:SliderRepeatButton}">
+        TargetType="{x:Type RepeatButton}">
         <Setter Property="OverridesDefaultStyle" Value="True" />
         <Setter Property="Focusable" Value="False" />
         <Setter Property="IsTabStop" Value="False" />
         <Setter Property="Template">
             <Setter.Value>
-                <ControlTemplate TargetType="{x:Type controls:SliderRepeatButton}">
-                    <Border
-                        x:Name="PART_Border"
+                <ControlTemplate TargetType="{x:Type RepeatButton}">
+                    <Rectangle
                         Width="{TemplateBinding Width}"
                         Height="{TemplateBinding Height}"
-                        Background="{TemplateBinding Background}" />
-                    <ControlTemplate.Triggers>
-                        <Trigger Property="RadiusOrientation" Value="Right">
-                            <Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Right}" />
-                        </Trigger>
-                        <Trigger Property="RadiusOrientation" Value="Left">
-                            <Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Left}" />
-                        </Trigger>
-                        <Trigger Property="RadiusOrientation" Value="Down">
-                            <Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}" />
-                        </Trigger>
-                        <Trigger Property="RadiusOrientation" Value="Up">
-                            <Setter TargetName="PART_Border" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Up}" />
-                        </Trigger>
-                    </ControlTemplate.Triggers>
+                        Fill="{TemplateBinding Background}" />
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -138,21 +123,19 @@
 
                 <Track x:Name="PART_Track" Grid.Row="1">
                     <Track.DecreaseRepeatButton>
-                        <controls:SliderRepeatButton
+                        <RepeatButton
                             Height="{StaticResource WD.RepeatButtonSize}"
                             Margin="0,2,0,0"
                             Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
                             Command="{x:Static Slider.DecreaseLarge}"
-                            RadiusOrientation="Right"
                             Style="{DynamicResource WD.SliderRepeatButtonStyle}" />
                     </Track.DecreaseRepeatButton>
                     <Track.IncreaseRepeatButton>
-                        <controls:SliderRepeatButton
+                        <RepeatButton
                             Height="{StaticResource WD.RepeatButtonSize}"
                             Margin="0,2,0,0"
                             Background="{DynamicResource WD.BaseSolidColorBrush}"
                             Command="{x:Static Slider.IncreaseLarge}"
-                            RadiusOrientation="Left"
                             Style="{StaticResource WD.SliderRepeatButtonStyle}" />
                     </Track.IncreaseRepeatButton>
                     <Track.Thumb>
@@ -209,19 +192,17 @@
                     Visibility="Collapsed" />
                 <Track x:Name="PART_Track" Grid.Column="1">
                     <Track.DecreaseRepeatButton>
-                        <controls:SliderRepeatButton
+                        <RepeatButton
                             Width="{StaticResource WD.RepeatButtonSize}"
                             Background="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
                             Command="{x:Static Slider.DecreaseLarge}"
-                            RadiusOrientation="Up"
                             Style="{StaticResource WD.SliderRepeatButtonStyle}" />
                     </Track.DecreaseRepeatButton>
                     <Track.IncreaseRepeatButton>
-                        <controls:SliderRepeatButton
+                        <RepeatButton
                             Width="{StaticResource WD.RepeatButtonSize}"
                             Background="{DynamicResource WD.LightSolidColorBrush}"
                             Command="{x:Static Slider.IncreaseLarge}"
-                            RadiusOrientation="Down"
                             Style="{StaticResource WD.SliderRepeatButtonStyle}" />
                     </Track.IncreaseRepeatButton>
                     <Track.Thumb>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml b/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
index 25873218..909859fc 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.TabControl.xaml
@@ -1,8 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers">
+    xmlns:controls="clr-namespace:WPFDevelopers.Controls">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Themes/Basic/ControlBasic.xaml" />
         <ResourceDictionary Source="../Themes/Basic/Animations.xaml" />
@@ -48,6 +47,11 @@
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="MouseOver" />
+                                <VisualState x:Name="Disabled" />
+                            </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </controls:SmallPanel>
                     <ControlTemplate.Triggers>
@@ -108,6 +112,11 @@
                                     </Storyboard>
                                 </VisualState>
                             </VisualStateGroup>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="MouseOver" />
+                                <VisualState x:Name="Disabled" />
+                            </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                     </controls:SmallPanel>
                     <ControlTemplate.Triggers>
@@ -159,18 +168,19 @@
         <Setter Property="HorizontalContentAlignment" Value="Center" />
         <Setter Property="VerticalContentAlignment" Value="Center" />
         <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="Padding" Value="{StaticResource WD.DefaultPadding}" />
+        <Setter Property="Padding" Value="2" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type TabControl}">
-                    <controls:WDBorder
-                        x:Name="PART_Border"
+                    <Border
                         Margin="{TemplateBinding Margin}"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}">
-                        <Grid Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}">
+                        BorderThickness="{TemplateBinding BorderThickness}">
+                        <Grid
+                            ClipToBounds="True"
+                            KeyboardNavigation.TabNavigation="Local"
+                            SnapsToDevicePixels="True">
                             <Grid.ColumnDefinitions>
                                 <ColumnDefinition Name="ColumnDefinition0" />
                                 <ColumnDefinition Name="ColumnDefinition1" Width="0" />
@@ -184,12 +194,10 @@
                                 Grid.Row="0"
                                 Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
-                                BorderThickness="0,0,0,1"
-                                ClipToBounds="True"
-                                CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Down}"
-                                SnapsToDevicePixels="True">
+                                BorderThickness="0,0,0,1">
                                 <TabPanel
                                     Name="HeaderPanel"
+                                    Margin="2,2,2,0"
                                     Panel.ZIndex="1"
                                     IsItemsHost="True"
                                     KeyboardNavigation.TabIndex="1" />
@@ -211,7 +219,7 @@
                                     SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}" />
                             </controls:SmallPanel>
                         </Grid>
-                    </controls:WDBorder>
+                    </Border>
                     <ControlTemplate.Triggers>
                         <Trigger Property="TabControl.TabStripPlacement" Value="Bottom">
                             <Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
@@ -219,7 +227,6 @@
                             <Setter TargetName="HeaderBorder" Property="Grid.Row" Value="1" />
                             <Setter TargetName="ContentPanel" Property="Grid.Row" Value="0" />
                             <Setter TargetName="HeaderBorder" Property="BorderThickness" Value="0,1,0,0" />
-                            <Setter TargetName="HeaderBorder" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Up}" />
                             <Setter Property="ItemContainerStyle" Value="{StaticResource WD.BottomTabItem}" />
                         </Trigger>
                         <Trigger Property="TabControl.TabStripPlacement" Value="Left">
@@ -230,7 +237,6 @@
                             <Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
                             <Setter TargetName="RowDefinition1" Property="RowDefinition.Height" Value="0" />
                             <Setter TargetName="HeaderBorder" Property="BorderThickness" Value="0,0,1,0" />
-                            <Setter TargetName="HeaderBorder" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Right}" />
                             <Setter Property="ItemContainerStyle" Value="{StaticResource WD.LeftTabItem}" />
                         </Trigger>
                         <Trigger Property="TabControl.TabStripPlacement" Value="Right">
@@ -242,7 +248,6 @@
                             <Setter TargetName="RowDefinition0" Property="RowDefinition.Height" Value="*" />
                             <Setter TargetName="RowDefinition1" Property="RowDefinition.Height" Value="0" />
                             <Setter TargetName="HeaderBorder" Property="BorderThickness" Value="1,0,0,0" />
-                            <Setter TargetName="HeaderBorder" Property="CornerRadius" Value="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}, Converter={StaticResource WD.CornerRadiusToSurroundConverter}, ConverterParameter=Left}" />
                             <Setter Property="ItemContainerStyle" Value="{StaticResource WD.RightTabItem}" />
                         </Trigger>
                     </ControlTemplate.Triggers>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.TextBox.xaml b/src/WPFDevelopers.Shared/Styles/Styles.TextBox.xaml
index e944f4e4..ce8c4334 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.TextBox.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.TextBox.xaml
@@ -3,7 +3,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:WPFDevelopers.Controls"
     xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
-    xmlns:resx="clr-namespace:WPFDevelopers">
+    xmlns:sys="clr-namespace:System;assembly=mscorlib">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="../Themes/Basic/ControlBasic.xaml" />
         <ResourceDictionary Source="../Themes/Basic/Animations.xaml" />
@@ -44,23 +44,6 @@
                                 Text="{Binding Path=(helpers:ElementHelper.Watermark), RelativeSource={RelativeSource TemplatedParent}}"
                                 Visibility="Collapsed" />
                             <ScrollViewer x:Name="PART_ContentHost" />
-                            <Button
-                                x:Name="PART_CloseButton"
-                                Width="20"
-                                Height="20"
-                                Margin="0,0,4,0"
-                                HorizontalAlignment="Right"
-                                helpers:ElementHelper.IsClear="{Binding Path=(helpers:ElementHelper.IsClear), RelativeSource={RelativeSource TemplatedParent}}"
-                                helpers:ElementHelper.IsRound="True"
-                                Style="{StaticResource WD.NormalButton}"
-                                ToolTip="{Binding [Clear], Source={x:Static resx:LanguageManager.Instance}}"
-                                Visibility="Collapsed">
-                                <controls:PathIcon
-                                    Width="10"
-                                    Height="10"
-                                    Foreground="{DynamicResource WD.SecondaryTextSolidColorBrush}"
-                                    Kind="WindowClose" />
-                            </Button>
                         </controls:SmallPanel>
                     </Border>
                     <ControlTemplate.Triggers>
@@ -73,23 +56,6 @@
                         <Trigger Property="IsMouseOver" Value="True">
                             <Setter Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
                         </Trigger>
-                        <Trigger Property="helpers:ElementHelper.IsClear" Value="True">
-                            <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Visible" />
-                        </Trigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="helpers:ElementHelper.IsClear" Value="True" />
-                                <Condition Property="Text" Value="{x:Null}" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Collapsed" />
-                        </MultiTrigger>
-                        <MultiTrigger>
-                            <MultiTrigger.Conditions>
-                                <Condition Property="helpers:ElementHelper.IsClear" Value="True" />
-                                <Condition Property="Text" Value="" />
-                            </MultiTrigger.Conditions>
-                            <Setter TargetName="PART_CloseButton" Property="Visibility" Value="Collapsed" />
-                        </MultiTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/WPFDevelopers.Shared/Styles/Styles.TreeView.xaml b/src/WPFDevelopers.Shared/Styles/Styles.TreeView.xaml
index 14492274..2ac94bcc 100644
--- a/src/WPFDevelopers.Shared/Styles/Styles.TreeView.xaml
+++ b/src/WPFDevelopers.Shared/Styles/Styles.TreeView.xaml
@@ -21,20 +21,17 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="TreeView">
-                    <controls:WDBorder
-                        Padding="{TemplateBinding Padding}"
+                    <Border
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}"
-                        CornerRadius="{Binding Path=(helpers:ElementHelper.CornerRadius), RelativeSource={RelativeSource TemplatedParent}}"
-                        SnapsToDevicePixels="True">
+                        BorderThickness="{TemplateBinding BorderThickness}">
                         <ScrollViewer
+                            Padding="{TemplateBinding Padding}"
                             CanContentScroll="False"
-                            Clip="{Binding RelativeSource={RelativeSource AncestorType=controls:WDBorder}, Path=ContentClip}"
                             Focusable="False">
                             <ItemsPresenter />
                         </ScrollViewer>
-                    </controls:WDBorder>
+                    </Border>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
diff --git a/src/WPFDevelopers.Shared/Themes/AnimationNavigationBar3D.xaml b/src/WPFDevelopers.Shared/Themes/AnimationNavigationBar3D.xaml
index 4c167ce2..a18d9c66 100644
--- a/src/WPFDevelopers.Shared/Themes/AnimationNavigationBar3D.xaml
+++ b/src/WPFDevelopers.Shared/Themes/AnimationNavigationBar3D.xaml
@@ -12,9 +12,6 @@
         TargetType="{x:Type controls:AnimationNavigationBar3DItem}">
         <Setter Property="Width" Value="80" />
         <Setter Property="Height" Value="80" />
-        <Setter Property="HorizontalContentAlignment" Value="Center" />
-        <Setter Property="VerticalContentAlignment" Value="Center" />
-        <Setter Property="Foreground" Value="{DynamicResource WD.WindowForegroundColorBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:AnimationNavigationBar3DItem}">
@@ -50,7 +47,7 @@
                         <Viewport3D.Children>
                             <ModelVisual3D>
                                 <ModelVisual3D.Content>
-                                    <AmbientLight Color="{DynamicResource WD.BackgroundColor}" />
+                                    <AmbientLight Color="{DynamicResource BackgroundColor}" />
                                 </ModelVisual3D.Content>
                             </ModelVisual3D>
                             <ContainerUIElement3D>
@@ -64,6 +61,7 @@
                                         </RotateTransform3D.Rotation>
                                     </RotateTransform3D>
                                 </ContainerUIElement3D.Transform>
+
                                 <Viewport2DVisual3D>
                                     <Viewport2DVisual3D.Material>
                                         <DiffuseMaterial Viewport2DVisual3D.IsVisualHostMaterial="True" />
@@ -77,14 +75,14 @@
                                     <Border
                                         Width="110"
                                         Height="110"
-                                        Background="{TemplateBinding Background}"
+                                        Background="{TemplateBinding FileBackground}"
                                         CornerRadius="0,0,0,0">
-                                        <ContentPresenter
-                                            x:Name="PART_ContentPresenter"
-                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                                        <Path
+                                            Width="40"
+                                            Height="40"
+                                            Data="{TemplateBinding PathDate}"
+                                            Fill="{DynamicResource WD.WindowForegroundColorBrush}"
+                                            Stretch="Fill" />
                                     </Border>
                                 </Viewport2DVisual3D>
                                 <Viewport2DVisual3D>
@@ -100,7 +98,7 @@
                                     <Border
                                         Width="110"
                                         Height="110"
-                                        Background="{TemplateBinding Fill}"
+                                        Background="{TemplateBinding BackFileBackground}"
                                         CornerRadius="0,0,0,0"
                                         RenderTransformOrigin="0.5,0.5">
                                         <Border.RenderTransform>
@@ -108,12 +106,19 @@
                                                 <RotateTransform Angle="90" />
                                             </TransformGroup>
                                         </Border.RenderTransform>
-                                        <ContentPresenter
-                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                            Content="{Binding ContentBack, RelativeSource={RelativeSource AncestorType={x:Type controls:AnimationNavigationBar3DItem}}}"
-                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
-                                            TextElement.Foreground="{TemplateBinding Foreground}" />
+                                        <StackPanel VerticalAlignment="Center">
+                                            <Path
+                                                Width="40"
+                                                Height="40"
+                                                Data="{TemplateBinding PathDate}"
+                                                Fill="{DynamicResource WD.WindowForegroundColorBrush}"
+                                                Stretch="Fill" />
+                                            <TextBlock
+                                                HorizontalAlignment="Center"
+                                                FontSize="{TemplateBinding FontSize}"
+                                                Foreground="{DynamicResource WD.BackgroundSolidColorBrush}"
+                                                Text="{TemplateBinding Text}" />
+                                        </StackPanel>
                                     </Border>
                                 </Viewport2DVisual3D>
                             </ContainerUIElement3D>
@@ -146,7 +151,7 @@
         <Setter Property="ItemsPanel">
             <Setter.Value>
                 <ItemsPanelTemplate>
-                    <UniformGrid Columns="{Binding Items.Count, RelativeSource={RelativeSource AncestorType={x:Type controls:AnimationNavigationBar3D}}}" />
+                    <UniformGrid Columns="{Binding Columns, RelativeSource={RelativeSource AncestorType={x:Type controls:AnimationNavigationBar3D}}}" />
                 </ItemsPanelTemplate>
             </Setter.Value>
         </Setter>
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml b/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
index da17c2ad..8a98925b 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/ControlBasic.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:converts="clr-namespace:WPFDevelopers.Converts"
     xmlns:sys="clr-namespace:System;assembly=mscorlib">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Font.xaml" />
@@ -57,8 +56,6 @@
         ShadowDepth="2"
         Color="{StaticResource WD.BlackColor}" />
     <BooleanToVisibilityConverter x:Key="WD.Bool2VisibilityConverter" />
-    <converts:CornerRadiusToSurroundConverter x:Key="WD.CornerRadiusToSurroundConverter" />
-    <converts:WidthHeightToRectConverter x:Key="WD.WidthHeightToRectConverter" />
     <Thickness x:Key="WD.TabItemBorderThickness">0,0,0,2</Thickness>
 
     <Style TargetType="ToolTip">
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/Dark.Color.xaml b/src/WPFDevelopers.Shared/Themes/Basic/Dark.Color.xaml
index f809e0a2..cfe874f7 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Dark.Color.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Dark.Color.xaml
@@ -1,79 +1,35 @@
-<ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
-    po:Freeze="True">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options" po:Freeze="True">
 
-    <!--  字体颜色  -->
+    <!--字体颜色-->
     <Color x:Key="WD.PrimaryTextColor" po:Freeze="True">#FFFFFF</Color>
-    <SolidColorBrush
-        x:Key="WD.PrimaryTextSolidColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.PrimaryTextColor}" />
-    <SolidColorBrush
-        x:Key="WD.WindowForegroundColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.PrimaryTextColor}" />
+    <SolidColorBrush x:Key="WD.PrimaryTextSolidColorBrush" Color="{StaticResource WD.PrimaryTextColor}" po:Freeze="True"></SolidColorBrush>
+    <SolidColorBrush x:Key="WD.WindowForegroundColorBrush" Color="{StaticResource WD.PrimaryTextColor}" po:Freeze="True"></SolidColorBrush>
 
     <Color x:Key="WD.RegularTextColor" po:Freeze="True">#FFFFFF</Color>
-    <SolidColorBrush
-        x:Key="WD.RegularTextSolidColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.RegularTextColor}" />
+    <SolidColorBrush x:Key="WD.RegularTextSolidColorBrush" Color="{StaticResource WD.RegularTextColor}" po:Freeze="True"></SolidColorBrush>
 
     <Color x:Key="WD.DefaultBackgroundColor" po:Freeze="True">#202020</Color>
-    <SolidColorBrush
-        x:Key="WD.DefaultBackgroundSolidColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.DefaultBackgroundColor}" />
-
-    <!--  背景色  -->
+    <SolidColorBrush x:Key="WD.DefaultBackgroundSolidColorBrush" Color="{StaticResource WD.DefaultBackgroundColor}" po:Freeze="True"></SolidColorBrush>
+    
+    <!--背景色-->
     <Color x:Key="WD.BackgroundColor" po:Freeze="True">#323232</Color>
-    <SolidColorBrush
-        x:Key="WD.BackgroundSolidColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.BackgroundColor}" />
+    <SolidColorBrush x:Key="WD.BackgroundSolidColorBrush" Color="{StaticResource WD.BackgroundColor}" po:Freeze="True"></SolidColorBrush>
 
     <Color x:Key="WD.WindowBorderBrushColor" po:Freeze="True">#202020</Color>
-    <SolidColorBrush
-        x:Key="WD.WindowBorderBrushSolidColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.WindowBorderBrushColor}" />
+    <SolidColorBrush x:Key="WD.WindowBorderBrushSolidColorBrush" Color="{StaticResource WD.WindowBorderBrushColor}" po:Freeze="True"></SolidColorBrush>
 
     <Color x:Key="WD.BaseColor" po:Freeze="True">#202020</Color>
-    <SolidColorBrush
-        x:Key="WD.BaseSolidColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.BaseColor}" />
+    <SolidColorBrush x:Key="WD.BaseSolidColorBrush" Color="{StaticResource WD.BaseColor}" po:Freeze="True"></SolidColorBrush>
 
     <Color x:Key="WD.BaseMoveColor" po:Freeze="True">#202020</Color>
-    <SolidColorBrush
-        x:Key=" WD.BaseMoveSolidColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.BaseMoveColor}" />
+    <SolidColorBrush x:Key=" WD.BaseMoveSolidColorBrush" Color="{StaticResource WD.BaseMoveColor}" po:Freeze="True"></SolidColorBrush>
 
     <Color x:Key="WD.LighterColor" po:Freeze="True">#202020</Color>
-    <SolidColorBrush
-        x:Key="WD.LighterSolidColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.LighterColor}" />
+    <SolidColorBrush x:Key="WD.LighterSolidColorBrush" Color="{StaticResource WD.LighterColor}" po:Freeze="True"></SolidColorBrush>
 
     <Color x:Key="WD.LightColor" po:Freeze="True">#202020</Color>
-    <SolidColorBrush
-        x:Key="WD.LightSolidColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.LightColor}" />
-
-    <Color x:Key="WD.ChartXAxisColor" po:Freeze="True">#42414F</Color>
-    <SolidColorBrush
-        x:Key="WD.ChartXAxisSolidColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.ChartXAxisColor}" />
-
-    <Color x:Key="WD.ChartFillColor" po:Freeze="True">#86849D</Color>
-    <SolidColorBrush
-        x:Key="WD.ChartFillSolidColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.ChartFillColor}" />
+    <SolidColorBrush x:Key="WD.LightSolidColorBrush" Color="{StaticResource WD.LightColor}" po:Freeze="True"></SolidColorBrush>
 
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml b/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml
index fba9cc3e..81e510a4 100644
--- a/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Basic/Light.Color.xaml
@@ -51,16 +51,4 @@
         po:Freeze="True"
         Color="{StaticResource WD.LightColor}" />
 
-    <Color x:Key="WD.ChartXAxisColor" po:Freeze="True">#E0E6F1</Color>
-    <SolidColorBrush
-        x:Key="WD.ChartXAxisSolidColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.ChartXAxisColor}" />
-
-    <Color x:Key="WD.ChartFillColor" po:Freeze="True">#6E7079</Color>
-    <SolidColorBrush
-        x:Key="WD.ChartFillSolidColorBrush"
-        po:Freeze="True"
-        Color="{StaticResource WD.ChartFillColor}" />
-
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml b/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml
index 365290c0..2774bb5c 100644
--- a/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml
+++ b/src/WPFDevelopers.Shared/Themes/CropAvatar.xaml
@@ -1,8 +1,7 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:resx="clr-namespace:WPFDevelopers">
+    xmlns:controls="clr-namespace:WPFDevelopers.Controls">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Basic/ControlBasic.xaml" />
     </ResourceDictionary.MergedDictionaries>
@@ -46,7 +45,6 @@
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Top"
                                 Style="{StaticResource WD.PathButton}"
-                                ToolTip="{Binding [Replace], Source={x:Static resx:LanguageManager.Instance}}"
                                 Visibility="Collapsed">
                                 <controls:PathIcon
                                     Width="15"
@@ -58,8 +56,7 @@
                                 x:Name="PART_AddButton"
                                 Width="40"
                                 Height="40"
-                                Style="{StaticResource WD.PathButton}"
-                                ToolTip="{Binding [Select], Source={x:Static resx:LanguageManager.Instance}}">
+                                Style="{StaticResource WD.PathButton}">
                                 <controls:PathIcon
                                     Width="20"
                                     Height="20"
diff --git a/src/WPFDevelopers.Shared/Themes/CropImage.xaml b/src/WPFDevelopers.Shared/Themes/CropImage.xaml
index 500a43ee..a81e30a1 100644
--- a/src/WPFDevelopers.Shared/Themes/CropImage.xaml
+++ b/src/WPFDevelopers.Shared/Themes/CropImage.xaml
@@ -22,8 +22,7 @@
                             Background="Transparent"
                             BorderBrush="{DynamicResource WD.PrimaryNormalSolidColorBrush}"
                             BorderThickness="2"
-                            Cursor="SizeAll"
-                            Visibility="Collapsed" />
+                            Cursor="SizeAll" />
                     </Canvas>
                 </ControlTemplate>
             </Setter.Value>
diff --git a/src/WPFDevelopers.Shared/Themes/DrawerMenu.xaml b/src/WPFDevelopers.Shared/Themes/DrawerMenu.xaml
index 49a3298f..94b127bc 100644
--- a/src/WPFDevelopers.Shared/Themes/DrawerMenu.xaml
+++ b/src/WPFDevelopers.Shared/Themes/DrawerMenu.xaml
@@ -2,7 +2,6 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
     xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Basic/ControlBasic.xaml" />
@@ -89,9 +88,6 @@
                             <Setter TargetName="Border" Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
                             <Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
                         </Trigger>
-                        <Trigger Property="IsMouseOver" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
-                        </Trigger>
                         <Trigger Property="IsEnabled" Value="False">
                             <Setter TargetName="Border" Property="Background" Value="Transparent" />
                             <Setter TargetName="Border" Property="BorderBrush" Value="Transparent" />
@@ -188,14 +184,12 @@
         <Setter Property="MenuIconColor" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
         <Setter Property="SelectionIndicatorColor" Value="{DynamicResource WD.PrimaryNormalSolidColorBrush}" />
         <Setter Property="MenuItemForeground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
-        <Setter Property="BorderThickness" Value="1" />
-        <Setter Property="BorderBrush" Value="{DynamicResource WD.BaseSolidColorBrush}" />
         <Setter Property="SelectedIndex" Value="0" />
         <Setter Property="Background" Value="{DynamicResource WD.BackgroundSolidColorBrush}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:DrawerMenu">
-                    <Grid>
+                    <Grid Background="{TemplateBinding Background}">
                         <Grid.RowDefinitions>
                             <RowDefinition Height="Auto" />
                             <RowDefinition />
diff --git a/src/WPFDevelopers.Shared/Themes/Message.xaml b/src/WPFDevelopers.Shared/Themes/Message.xaml
index 3bd5f03e..4a86b04b 100644
--- a/src/WPFDevelopers.Shared/Themes/Message.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Message.xaml
@@ -2,8 +2,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
-    xmlns:resx="clr-namespace:WPFDevelopers">
+    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Basic/ControlBasic.xaml" />
     </ResourceDictionary.MergedDictionaries>
@@ -113,7 +112,7 @@
                                     HorizontalAlignment="Right"
                                     helpers:ElementHelper.IsRound="True"
                                     Style="{StaticResource WD.NormalButton}"
-                                    ToolTip="{Binding [Close], Source={x:Static resx:LanguageManager.Instance}}">
+                                    ToolTip="关闭">
                                     <controls:PathIcon
                                         Width="10"
                                         Height="10"
diff --git a/src/WPFDevelopers.Shared/Themes/NavigateMenu.xaml b/src/WPFDevelopers.Shared/Themes/NavigateMenu.xaml
new file mode 100644
index 00000000..b16b069b
--- /dev/null
+++ b/src/WPFDevelopers.Shared/Themes/NavigateMenu.xaml
@@ -0,0 +1,154 @@
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:controls="clr-namespace:WPFDevelopers.Controls">
+    <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary Source="Basic/ControlBasic.xaml" />
+    </ResourceDictionary.MergedDictionaries>
+    <ControlTemplate x:Key="WD.NavigateMenuLeft" TargetType="{x:Type controls:NavigateMenu}">
+        <controls:SmallPanel ClipToBounds="True">
+            <ListBox
+                x:Name="PART_ListBox"
+                Background="Transparent"
+                BorderThickness="0"
+                ItemsSource="{TemplateBinding ItemsSource}"
+                ScrollViewer.VerticalScrollBarVisibility="Hidden"
+                SelectedIndex="{Binding SelectedIndex, RelativeSource={RelativeSource AncestorType={x:Type controls:NavigateMenu}}}"
+                SelectedItem="{Binding SelectedItem, RelativeSource={RelativeSource AncestorType={x:Type controls:NavigateMenu}}}">
+                <ListBox.ItemTemplate>
+                    <DataTemplate>
+                        <TextBlock Text="{Binding Content}" TextTrimming="CharacterEllipsis" />
+                    </DataTemplate>
+                </ListBox.ItemTemplate>
+                <ListBox.ItemContainerStyle>
+                    <Style BasedOn="{x:Null}" TargetType="ListBoxItem">
+                        <Setter Property="VerticalContentAlignment" Value="Center" />
+
+                        <Setter Property="Padding" Value="10,8" />
+                        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+                        <Setter Property="Template">
+                            <Setter.Value>
+                                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                                    <Border
+                                        x:Name="PART_Border"
+                                        Padding="{TemplateBinding Padding}"
+                                        Background="{TemplateBinding Background}"
+                                        BorderBrush="{TemplateBinding BorderBrush}"
+                                        BorderThickness="{TemplateBinding BorderThickness}"
+                                        SnapsToDevicePixels="true">
+                                        <ContentPresenter
+                                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                                    </Border>
+                                    <ControlTemplate.Triggers>
+                                        <Trigger Property="IsSelected" Value="True">
+                                            <Setter Property="Background" Value="{DynamicResource WD.DefaultBackgroundSolidColorBrush}" />
+                                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
+                                        </Trigger>
+                                        <Trigger Property="IsMouseOver" Value="True">
+                                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
+                                        </Trigger>
+                                    </ControlTemplate.Triggers>
+                                </ControlTemplate>
+                            </Setter.Value>
+                        </Setter>
+                    </Style>
+                </ListBox.ItemContainerStyle>
+            </ListBox>
+            <Rectangle
+                x:Name="PART_RectangleSlider"
+                Width="3"
+                Height="{TemplateBinding Height}"
+                HorizontalAlignment="Right"
+                Fill="{DynamicResource WD.LighterSolidColorBrush}" />
+            <Rectangle
+                Width="3"
+                Height="35"
+                HorizontalAlignment="Right"
+                VerticalAlignment="Top"
+                Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}">
+                <Rectangle.RenderTransform>
+                    <TranslateTransform x:Name="PART_TranslateTransform" />
+                </Rectangle.RenderTransform>
+            </Rectangle>
+        </controls:SmallPanel>
+    </ControlTemplate>
+    <!--  还未完成  -->
+    <Style
+        x:Key="WD.NavigateMenuItem"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type ListBoxItem}">
+        <Setter Property="VerticalContentAlignment" Value="Center" />
+        <Setter Property="Padding" Value="10,8" />
+        <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryTextSolidColorBrush}" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ListBoxItem}">
+                    <Border
+                        x:Name="PART_Border"
+                        Padding="{TemplateBinding Padding}"
+                        Background="{TemplateBinding Background}"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        SnapsToDevicePixels="true">
+                        <ContentPresenter
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                    </Border>
+                    <ControlTemplate.Triggers>
+                        <Trigger Property="IsSelected" Value="True">
+                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryPressedSolidColorBrush}" />
+                        </Trigger>
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Setter Property="Foreground" Value="{DynamicResource WD.PrimaryMouseOverSolidColorBrush}" />
+                        </Trigger>
+                    </ControlTemplate.Triggers>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+    <ControlTemplate x:Key="WD.NavigateMenuTop" TargetType="{x:Type controls:NavigateMenu}">
+        <Grid>
+            <Rectangle
+                x:Name="PART_RectangleSlider"
+                Width="{TemplateBinding Width}"
+                Height="3"
+                VerticalAlignment="Bottom"
+                Fill="{DynamicResource WD.LighterSolidColorBrush}" />
+            <Rectangle
+                Width="{TemplateBinding RectangleSelectWidth}"
+                Height="3"
+                HorizontalAlignment="Left"
+                VerticalAlignment="Bottom"
+                Fill="{DynamicResource WD.PrimaryNormalSolidColorBrush}">
+                <Rectangle.RenderTransform>
+                    <TranslateTransform x:Name="PART_TranslateTransform" />
+                </Rectangle.RenderTransform>
+            </Rectangle>
+            <ItemsPresenter />
+        </Grid>
+    </ControlTemplate>
+    <Style
+        x:Key="WD.NavigateMenu"
+        BasedOn="{StaticResource WD.ControlBasicStyle}"
+        TargetType="{x:Type controls:NavigateMenu}">
+        <Style.Triggers>
+            <Trigger Property="TabStripPlacement" Value="Left">
+                <Setter Property="Template" Value="{StaticResource WD.NavigateMenuLeft}" />
+            </Trigger>
+            <Trigger Property="TabStripPlacement" Value="Top">
+                <Setter Property="ItemsPanel">
+                    <Setter.Value>
+                        <ItemsPanelTemplate>
+                            <VirtualizingStackPanel Orientation="Horizontal" />
+                        </ItemsPanelTemplate>
+                    </Setter.Value>
+                </Setter>
+                <Setter Property="Template" Value="{StaticResource WD.NavigateMenuTop}" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
+    <Style BasedOn="{StaticResource WD.NavigateMenu}" TargetType="{x:Type controls:NavigateMenu}" />
+</ResourceDictionary>
\ No newline at end of file
diff --git a/src/WPFDevelopers.Shared/Themes/Pagination.xaml b/src/WPFDevelopers.Shared/Themes/Pagination.xaml
index de2a2c1a..4b62f29d 100644
--- a/src/WPFDevelopers.Shared/Themes/Pagination.xaml
+++ b/src/WPFDevelopers.Shared/Themes/Pagination.xaml
@@ -2,8 +2,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
-    xmlns:resx="clr-namespace:WPFDevelopers">
+    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Basic/ControlBasic.xaml" />
     </ResourceDictionary.MergedDictionaries>
@@ -103,11 +102,7 @@
                     <ColumnDefinition Width="5" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <WrapPanel VerticalAlignment="Center">
-                    <TextBlock Text="{Binding [Total], Source={x:Static resx:LanguageManager.Instance}}" />
-                    <TextBlock Text="{Binding Count, StringFormat=' {0} ', RelativeSource={RelativeSource TemplatedParent}}" />
-                    <TextBlock Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
-                </WrapPanel>
+                <TextBlock VerticalAlignment="Center" Text="{Binding Count, StringFormat=共 {0} 条, RelativeSource={RelativeSource TemplatedParent}}" />
                 <controls:NumericBox
                     x:Name="PART_CountPerPageNumericBox"
                     Grid.Column="2"
@@ -117,14 +112,10 @@
                     Minimum="1"
                     TextAlignment="Center"
                     UpDownButtonsWidth="0" />
-                <WrapPanel
+                <TextBlock
                     Grid.Column="3"
-                    Margin="3,0,0,0"
-                    VerticalAlignment="Center">
-                    <TextBlock Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
-                    <TextBlock Text=" /  " />
-                    <TextBlock Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
-                </WrapPanel>
+                    VerticalAlignment="Center"
+                    Text=" 条 / 页" />
                 <Button
                     Grid.Column="5"
                     Width="32"
@@ -181,19 +172,15 @@
                                 <ColumnDefinition Width="Auto" />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>
-                            <WrapPanel Margin="0,0,15,0" VerticalAlignment="Center">
-                                <TextBlock Text="{Binding [Total], Source={x:Static resx:LanguageManager.Instance}}" />
-                                <TextBlock Text="{Binding Count, StringFormat=' {0} ', RelativeSource={RelativeSource TemplatedParent}}" />
-                                <TextBlock Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
-                            </WrapPanel>
+                            <TextBlock
+                                Margin="0,0,15,0"
+                                VerticalAlignment="Center"
+                                Text="{Binding Count, StringFormat=共 {0} 条, RelativeSource={RelativeSource TemplatedParent}}" />
                             <StackPanel
                                 Grid.Column="1"
                                 Margin="0,0,15,0"
                                 Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="0,0,3,0"
-                                    VerticalAlignment="Center"
-                                    Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
+                                <TextBlock VerticalAlignment="Center" Text="每页 " />
                                 <controls:NumericBox
                                     x:Name="PART_CountPerPageNumericBox"
                                     Grid.Column="2"
@@ -203,10 +190,7 @@
                                     Minimum="1"
                                     TextAlignment="Center"
                                     UpDownButtonsWidth="0" />
-                                <TextBlock
-                                    Margin="3,0,0,0"
-                                    VerticalAlignment="Center"
-                                    Text="{Binding [Items], Source={x:Static resx:LanguageManager.Instance}}" />
+                                <TextBlock VerticalAlignment="Center" Text=" 条" />
                             </StackPanel>
                             <Button
                                 Grid.Column="2"
@@ -237,10 +221,7 @@
                                 <controls:PathIcon Kind="Next" Style="{StaticResource WD.MiniPathIcon}" />
                             </Button>
                             <StackPanel Grid.Column="5" Orientation="Horizontal">
-                                <TextBlock
-                                    Margin="3,0"
-                                    VerticalAlignment="Center"
-                                    Text="{Binding [Goto], Source={x:Static resx:LanguageManager.Instance}}" />
+                                <TextBlock VerticalAlignment="Center" Text=" 前往 " />
                                 <controls:NumericBox
                                     x:Name="PART_JumpPageNumericBox"
                                     Width="32"
@@ -249,10 +230,7 @@
                                     Minimum="1"
                                     TextAlignment="Center"
                                     UpDownButtonsWidth="0" />
-                                <TextBlock
-                                    Margin="3,0,0,0"
-                                    VerticalAlignment="Center"
-                                    Text="{Binding [Page], Source={x:Static resx:LanguageManager.Instance}}" />
+                                <TextBlock VerticalAlignment="Center" Text=" 页" />
                             </StackPanel>
                         </Grid>
                     </Border>
diff --git a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
index 29f60eda..0cfe0a2d 100644
--- a/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
+++ b/src/WPFDevelopers.Shared/Themes/ScreenCut.xaml
@@ -2,8 +2,7 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="clr-namespace:WPFDevelopers.Controls"
-    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers"
-    xmlns:resx="clr-namespace:WPFDevelopers">
+    xmlns:helpers="clr-namespace:WPFDevelopers.Helpers">
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="Basic/ControlBasic.xaml" />
         <ResourceDictionary Source="ButtonsStyles.xaml" />
@@ -80,7 +79,7 @@
                                         x:Name="PART_RadioButtonRectangle"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathRadioButton}"
-                                        ToolTip="{Binding [Rectangle], Source={x:Static resx:LanguageManager.Instance}}">
+                                        ToolTip="方框">
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
@@ -91,7 +90,7 @@
                                         x:Name="PART_RadioButtonEllipse"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathRadioButton}"
-                                        ToolTip="{Binding [Ellipse], Source={x:Static resx:LanguageManager.Instance}}">
+                                        ToolTip="椭圆">
                                         <Ellipse
                                             Width="19"
                                             Height="19"
@@ -104,7 +103,7 @@
                                         x:Name="PART_RadioButtonArrow"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathRadioButton}"
-                                        ToolTip="{Binding [Arrow], Source={x:Static resx:LanguageManager.Instance}}">
+                                        ToolTip="箭头">
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
@@ -115,7 +114,7 @@
                                         x:Name="PART_RadioButtonInk"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathRadioButton}"
-                                        ToolTip="{Binding [Ink], Source={x:Static resx:LanguageManager.Instance}}">
+                                        ToolTip="画笔">
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
@@ -126,7 +125,7 @@
                                         x:Name="PART_RadioButtonText"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathRadioButton}"
-                                        ToolTip="{Binding [Text], Source={x:Static resx:LanguageManager.Instance}}">
+                                        ToolTip="文字">
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
@@ -142,7 +141,7 @@
                                         x:Name="PART_ButtonSave"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathButton}"
-                                        ToolTip="{Binding [Save], Source={x:Static resx:LanguageManager.Instance}}">
+                                        ToolTip="保存">
                                         <controls:PathIcon
                                             Width="18"
                                             Height="18"
@@ -153,7 +152,7 @@
                                         x:Name="PART_ButtonCancel"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathButton}"
-                                        ToolTip="{Binding [Cancel], Source={x:Static resx:LanguageManager.Instance}}">
+                                        ToolTip="取消">
                                         <controls:PathIcon
                                             Width="14"
                                             Height="14"
@@ -164,7 +163,7 @@
                                         x:Name="PART_ButtonComplete"
                                         Margin="4,0"
                                         Style="{DynamicResource WD.PathButton}"
-                                        ToolTip="{Binding [Complete], Source={x:Static resx:LanguageManager.Instance}}">
+                                        ToolTip="完成">
                                         <controls:PathIcon
                                             Width="20"
                                             Height="15"
diff --git a/src/WPFDevelopers.Shared/Themes/Theme40.txt b/src/WPFDevelopers.Shared/Themes/Theme40.txt
index fdc20b1f..25acc0ee 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme40.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme40.txt
@@ -48,6 +48,7 @@ CircularMenu.xaml
 CircularProgressBar.xaml
 EdgeLight.xaml
 LoadingGroup.xaml
+NavigateMenu.xaml
 Pagination.xaml
 ScreenCut.xaml
 SpotLight.xaml
diff --git a/src/WPFDevelopers.Shared/Themes/Theme45x.txt b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
index 9c851e0b..0b6b5bc7 100644
--- a/src/WPFDevelopers.Shared/Themes/Theme45x.txt
+++ b/src/WPFDevelopers.Shared/Themes/Theme45x.txt
@@ -49,6 +49,7 @@ CircularMenu.xaml
 CircularProgressBar.xaml
 EdgeLight.xaml
 LoadingGroup.xaml
+NavigateMenu.xaml
 Pagination.xaml
 ScreenCut.xaml
 SpotLight.xaml
diff --git a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
index 53988172..ac8b3ddf 100644
--- a/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
+++ b/src/WPFDevelopers.Shared/WPFDevelopers.Shared.projitems
@@ -9,12 +9,6 @@
     <Import_RootNamespace>WPFDevelopers</Import_RootNamespace>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\BaseControls\SliderRepeatButton.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\BaseControls\WDBorder.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Charts\ChartBase.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Charts\ChartLine.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Charts\ChartRect.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Charts\ChartRound.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\ColorPicker.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSB.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ColorPicker\HSL.cs" />
@@ -43,17 +37,13 @@
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\BreadCrumbBarConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\ColorConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\ColorTypeToVisibilityConverter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\CornerRadiusToSurroundConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\DatePickerToCurrentConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\HalfValueConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\OrientationConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\WidthHeightEqualValueConverter.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\GeometryHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\Helper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\ImagingHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Core\Converts\WidthHeightToRectConverter.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\TextBoxHelper.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Languages\Language.Designer.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\TextBoxValueChangedEventArgs.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\DatePickerHelper.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\ListBoxItemExtensions.cs" />
@@ -64,7 +54,7 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\AnimationNavigationBar3D\AnimationNavigationBar3DItem.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\ThemeChangedEvent.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Utilities\BaseControl.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Charts\ChartBar.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\BasicBarChart\BasicBarChart.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BreatheLight\BreathLamp.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BubblleControl\BubbleControl.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\BubblleControl\BubblleCanvas.cs" />
@@ -91,9 +81,10 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Mask\Mask.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Mask\MaskControl.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\MessageBox\MessageBox.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\MessageBox\WDMessageBox.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\MessageBox\WPFMessageBox.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\MultiSelectComboBox\MultiSelectComboBox.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\MultiSelectComboBox\MultiSelectComboBoxItem.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\NavigateMenu\NavigateMenu.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\NotifyIcon\NotifyIcon.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\NotifyIcon\Runtimes\Gdi32Interop.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\NotifyIcon\Runtimes\Interop\BitmapHandle.cs" />
@@ -122,7 +113,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Pagination\Pagination.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Panel\SixGirdView.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Panel\SmallPanel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)Controls\Charts\ChartRadar.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\RadarChart\RadarChart.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)Controls\RadarChart\RadarModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\Ruler\Ruler.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ScreenCut\ScreenCapture.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Controls\ScreenCut\ScreenCut.cs" />
@@ -157,7 +149,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\ViewModelBase.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\Win32.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Core\Helpers\WindowHelpers.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)LanguageManager.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Microsoft.Expression.Controls\ChangedPathLayoutProperties.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Microsoft.Expression.Controls\Distribution.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)Microsoft.Expression.Controls\DistributionStrategy.cs" />
@@ -532,6 +523,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Themes\NavigateMenu.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)Themes\Pagination.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -566,9 +561,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Languages\Language.en-US.resx" />
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Languages\Language.ko-KR.resx" />
-    <EmbeddedResource Include="$(MSBuildThisFileDirectory)Languages\Language.resx" />
     <EmbeddedResource Include="$(MSBuildThisFileDirectory)GZ\WPFDevelopersExt.exe.gz" />
     <None Include="$(MSBuildThisFileDirectory)Microsoft.Expression.Media.Effects\Shaders\blindstransitioneffect.ps" />
     <None Include="$(MSBuildThisFileDirectory)Microsoft.Expression.Media.Effects\Shaders\bloom.ps" />
diff --git a/src/WPFDevelopers.sln b/src/WPFDevelopers.sln
index 4014fd8b..9bd16c28 100644
--- a/src/WPFDevelopers.sln
+++ b/src/WPFDevelopers.sln
@@ -80,8 +80,6 @@ Global
 		{88DD2697-4DF1-40DC-B33B-DE1FD9846800} = {2C729CA5-1110-40DA-8EF4-2A7549072C53}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
-		RESX_SaveFilesImmediatelyUponChange = False
-		RESX_NeutralResourcesLanguage = zh-CN
 		SolutionGuid = {641F8D5D-5514-4C9A-9FAB-7FAF38D9C008}
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution